diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2016-12-12 01:43:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 01:43:04 +0100 |
| commit | 76a791b61c6da0d57a8f32057b7a220f03aa30b9 (patch) | |
| tree | a316dda4d5b66867b916902d7b9069b9991b3986 /pkgs | |
| parent | c1cbe2608468efb0c1d347005f25dad690538d84 (diff) | |
| parent | 50d63e1e3f01451c34923e6ea9d67ae1a1d183c7 (diff) | |
| download | nixpkgs-76a791b61c6da0d57a8f32057b7a220f03aa30b9.tar nixpkgs-76a791b61c6da0d57a8f32057b7a220f03aa30b9.tar.gz nixpkgs-76a791b61c6da0d57a8f32057b7a220f03aa30b9.tar.bz2 nixpkgs-76a791b61c6da0d57a8f32057b7a220f03aa30b9.tar.lz nixpkgs-76a791b61c6da0d57a8f32057b7a220f03aa30b9.tar.xz nixpkgs-76a791b61c6da0d57a8f32057b7a220f03aa30b9.tar.zst nixpkgs-76a791b61c6da0d57a8f32057b7a220f03aa30b9.zip | |
Merge pull request #21081 from Mic92/libxslt
libxslt: add option to enable crypto support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ebad3fd3eb1..7798c806982 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs -, python2, pythonSupport ? (! stdenv ? cross) +{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2 +, cryptoSupport ? false +, pythonSupport ? (! stdenv ? cross) }: assert pythonSupport -> python2 != null; assert pythonSupport -> libxml2.pythonSupport; +with stdenv.lib; + stdenv.mkDerivation rec { name = "libxslt-1.1.29"; @@ -21,18 +24,18 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs ]; - configureFlags = [ - "--without-crypto" + # TODO move cryptoSupport as last flag, when upgrading libxslt + configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [ "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ stdenv.lib.optional pythonSupport "--with-python=${python2}"; + ] ++ optional pythonSupport "--with-python=${python2}"; postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" moveToOutput share/man/man1 "$bin" - '' + stdenv.lib.optionalString pythonSupport '' + '' + optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs moveToOutput lib/python2.7 "$py" |