diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index eb23e16d653a..3993b3f73e1f 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , pkg-config -, libxml2, findXMLCatalogs, gettext, python3, libgcrypt +, libxml2, findXMLCatalogs, gettext, python, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2.dev ] ++ lib.optional stdenv.isDarwin gettext - ++ lib.optionals pythonSupport [ libxml2.py python3 ] + ++ lib.optionals pythonSupport [ libxml2.py python ] ++ lib.optionals cryptoSupport [ libgcrypt ]; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ lib.optional pythonSupport "--with-python=${python3}" + ] ++ lib.optional pythonSupport "--with-python=${python}" ++ lib.optional (!cryptoSupport) "--without-crypto"; postFixup = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs - moveToOutput ${python3.libPrefix} "$py" + moveToOutput ${python.libPrefix} "$py" ''; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe1c97840eb7..0d8376496505 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18672,7 +18672,9 @@ with pkgs; libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { }; + libxslt = callPackage ../development/libraries/libxslt { + python = python3; + }; libxsmm = callPackage ../development/libraries/libxsmm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24a0dcb52fc3..8d70a2b95665 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4598,8 +4598,7 @@ in { libxslt = (toPythonModule (pkgs.libxslt.override { pythonSupport = true; - python3 = python; - inherit (self) libxml2; + inherit (self) python libxml2; })).py; license-expression = callPackage ../development/python-modules/license-expression { };