public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxslt: use python3 for build and as default for bindings

Browse Source 
Changing the default may cause breakage, however, users should have already switched to `pythonPackages.libxslt` long ago.
This commit is contained in:
Frederik Rietdijk
2019-06-15 20:32:52 +02:00
committed by Frederik Rietdijk
parent a51aa02c78
commit 94e4dd8960
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libxslt/default.nix
View File

@@ -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 = {