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

libxml2: supportPython -> pythonSupport

Browse Source 
since that is more commonly used in Nixpkgs.
This commit is contained in:
Frederik Rietdijk 2016-11-08 10:55:21 +01:00
parent d2111660c5
commit 6b70ac81bb
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/libxml2/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch { stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch
, supportPython ? (! stdenv ? cross) }: , pythonSupport ? (! stdenv ? cross) }:
let let
python = python2; python = python2;
@ -28,10 +28,10 @@ in stdenv.mkDerivation rec {
}; };
outputs = [ "bin" "dev" "out" "doc" ] outputs = [ "bin" "dev" "out" "doc" ]
++ lib.optional supportPython "py"; ++ lib.optional pythonSupport "py";
propagatedBuildOutputs = "out bin" + lib.optionalString supportPython " py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
buildInputs = lib.optional supportPython python buildInputs = lib.optional pythonSupport python
# Libxml2 has an optional dependency on liblzma. However, on impure # Libxml2 has an optional dependency on liblzma. However, on impure
# platforms, it may end up using that from /usr/lib, and thus lack a # platforms, it may end up using that from /usr/lib, and thus lack a
# RUNPATH for that, leading to undefined references for its users. # RUNPATH for that, leading to undefined references for its users.
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib findXMLCatalogs ]; propagatedBuildInputs = [ zlib findXMLCatalogs ];
configureFlags = lib.optional supportPython "--with-python=${python}" configureFlags = lib.optional pythonSupport "--with-python=${python}"
++ [ "--exec_prefix=$dev" ]; ++ [ "--exec_prefix=$dev" ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -55,9 +55,9 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ findXMLCatalogs libiconv ]; propagatedBuildInputs = [ findXMLCatalogs libiconv ];
}; };
preInstall = lib.optionalString supportPython preInstall = lib.optionalString pythonSupport
''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
installFlags = lib.optionalString supportPython installFlags = lib.optionalString pythonSupport
''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"'';
postFixup = '' postFixup = ''
@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
moveToOutput share/man/man1 "$bin" moveToOutput share/man/man1 "$bin"
''; '';
passthru = { inherit version; pythonSupport = supportPython; }; passthru = { inherit version; pythonSupport = pythonSupport; };
meta = { meta = {
homepage = http://xmlsoft.org/; homepage = http://xmlsoft.org/;

2
pkgs/top-level/emscripten-packages.nix
View File

@ -10,7 +10,7 @@ with pkgs; rec {
libxml2 = (pkgs.libxml2.override { libxml2 = (pkgs.libxml2.override {
stdenv = emscriptenStdenv; stdenv = emscriptenStdenv;
supportPython = false; pythonSupport = false;
}).overrideDerivation }).overrideDerivation
(old: { (old: {
buildInputs = old.buildInputs ++ [ autoreconfHook pkgconfig zlib nodejs ]; buildInputs = old.buildInputs ++ [ autoreconfHook pkgconfig zlib nodejs ];

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

@ -13448,7 +13448,7 @@ in {
}; };
libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else
(pkgs.libxml2.override{supportPython=true; python2=python;}).py; (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py;
libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else
(pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;}).py; (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;}).py;