mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

libxslt: Use python as function argument instead of python3

Browse source 
This package works just fine with python2, let's not give the impression that it's strictly python3.
This commit is contained in:
adisbladis 2022-01-12 16:44:58 +13:00
parent 5d792df138
commit d276350eb5
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/libxslt/default.nix
View file

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

4
pkgs/top-level/all-packages.nix
View file

@ -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 { };

3
pkgs/top-level/python-packages.nix
View file

@ -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 { };