nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-31 17:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154700 from adisbladis/libxslt-py-argname

Browse Source
This commit is contained in:
Martin Weinelt 2022-01-12 16:32:17 +01:00 committed by GitHub
commit 5bd5e98a86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { lib, stdenv, fetchurl
, pkg-config , pkg-config
, libxml2, findXMLCatalogs, gettext, python3, libgcrypt , libxml2, findXMLCatalogs, gettext, python, libgcrypt
, cryptoSupport ? false , cryptoSupport ? false
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2.dev ] buildInputs = [ libxml2.dev ]
++ lib.optional stdenv.isDarwin gettext ++ lib.optional stdenv.isDarwin gettext
++ lib.optionals pythonSupport [ libxml2.py python3 ] ++ lib.optionals pythonSupport [ libxml2.py python ]
++ lib.optionals cryptoSupport [ libgcrypt ]; ++ lib.optionals cryptoSupport [ libgcrypt ];
propagatedBuildInputs = [ findXMLCatalogs ]; propagatedBuildInputs = [ findXMLCatalogs ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"--without-debug" "--without-debug"
"--without-mem-debug" "--without-mem-debug"
"--without-debugger" "--without-debugger"
] ++ lib.optional pythonSupport "--with-python=${python3}" ] ++ lib.optional pythonSupport "--with-python=${python}"
++ lib.optional (!cryptoSupport) "--without-crypto"; ++ lib.optional (!cryptoSupport) "--without-crypto";
postFixup = '' postFixup = ''
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
'' + lib.optionalString pythonSupport '' '' + lib.optionalString pythonSupport ''
mkdir -p $py/nix-support mkdir -p $py/nix-support
echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
moveToOutput ${python3.libPrefix} "$py" moveToOutput ${python.libPrefix} "$py"
''; '';
passthru = { passthru = {

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

@ -18676,7 +18676,9 @@ with pkgs;
libxmp = callPackage ../development/libraries/libxmp { }; libxmp = callPackage ../development/libraries/libxmp { };
libxslt = callPackage ../development/libraries/libxslt { }; libxslt = callPackage ../development/libraries/libxslt {
python = python3;
};
libxsmm = callPackage ../development/libraries/libxsmm { }; libxsmm = callPackage ../development/libraries/libxsmm { };

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

@ -4598,8 +4598,7 @@ in {
libxslt = (toPythonModule (pkgs.libxslt.override { libxslt = (toPythonModule (pkgs.libxslt.override {
pythonSupport = true; pythonSupport = true;
python3 = python; inherit (self) python libxml2;
inherit (self) libxml2;
})).py; })).py;
license-expression = callPackage ../development/python-modules/license-expression { }; license-expression = callPackage ../development/python-modules/license-expression { };