diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-11-08 10:55:21 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-11-08 17:10:05 +0100 |
commit | 6b70ac81bbe823c220afea101ab814bf26e59fdd (patch) | |
tree | f3c29a1746e8c618695b18b580249a77513200e3 /pkgs/development/libraries/libxml2 | |
parent | d2111660c557bcd59c1be25ff01190365c389c7c (diff) |
libxml2: supportPython -> pythonSupport
since that is more commonly used in Nixpkgs.
Diffstat (limited to 'pkgs/development/libraries/libxml2')
-rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 4831f150f45b5..80354b10f3b99 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch -, supportPython ? (! stdenv ? cross) }: +, pythonSupport ? (! stdenv ? cross) }: let python = python2; @@ -28,10 +28,10 @@ in stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" "doc" ] - ++ lib.optional supportPython "py"; - propagatedBuildOutputs = "out bin" + lib.optionalString supportPython " py"; + ++ lib.optional pythonSupport "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 # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib findXMLCatalogs ]; - configureFlags = lib.optional supportPython "--with-python=${python}" + configureFlags = lib.optional pythonSupport "--with-python=${python}" ++ [ "--exec_prefix=$dev" ]; enableParallelBuilding = true; @@ -55,9 +55,9 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs libiconv ]; }; - preInstall = lib.optionalString supportPython + preInstall = lib.optionalString pythonSupport ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = lib.optionalString supportPython + installFlags = lib.optionalString pythonSupport ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; postFixup = '' @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { moveToOutput share/man/man1 "$bin" ''; - passthru = { inherit version; pythonSupport = supportPython; }; + passthru = { inherit version; pythonSupport = pythonSupport; }; meta = { homepage = http://xmlsoft.org/; |