diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-15 20:32:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-10-29 13:47:03 +0100 |
| commit | 94e4dd89609fe01cd07fa28096fa5c6a7a6b8aab (patch) | |
| tree | 417c009f7d867fabea16a721e284f515f829d081 /pkgs/development/libraries/libxslt/default.nix | |
| parent | a51aa02c7849229cac80c4697d026650a5bd8a73 (diff) | |
| download | nixpkgs-94e4dd89609fe01cd07fa28096fa5c6a7a6b8aab.tar nixpkgs-94e4dd89609fe01cd07fa28096fa5c6a7a6b8aab.tar.gz nixpkgs-94e4dd89609fe01cd07fa28096fa5c6a7a6b8aab.tar.bz2 nixpkgs-94e4dd89609fe01cd07fa28096fa5c6a7a6b8aab.tar.lz nixpkgs-94e4dd89609fe01cd07fa28096fa5c6a7a6b8aab.tar.xz nixpkgs-94e4dd89609fe01cd07fa28096fa5c6a7a6b8aab.tar.zst nixpkgs-94e4dd89609fe01cd07fa28096fa5c6a7a6b8aab.zip | |
libxslt: use python3 for build and as default for bindings
Changing the default may cause breakage, however, users should have already switched to `pythonPackages.libxslt` long ago.
Diffstat (limited to 'pkgs/development/libraries/libxslt/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 1a3efee176a..ed77a1873a8 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2, libgcrypt +{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: -assert pythonSupport -> python2 != null; +assert pythonSupport -> python != null; assert pythonSupport -> libxml2.pythonSupport; with stdenv.lib; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] - ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ] + ++ stdenv.lib.optionals pythonSupport [ libxml2.py python ] ++ stdenv.lib.optionals cryptoSupport [ libgcrypt ]; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ optional pythonSupport "--with-python=${python2}" + ] ++ optional pythonSupport "--with-python=${python}" ++ optional (!cryptoSupport) "--without-crypto"; postFixup = '' @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { '' + optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs - moveToOutput lib/python2.7 "$py" + moveToOutput ${python.libPrefix} "$py" ''; passthru = { |