diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 13:23:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 13:44:16 +0200 |
commit | 38313d5d877fc421d1381971051107e4b03dc40d (patch) | |
tree | 8143c1a0d11cd8d0cf10fe59a67508baa975ffba /pkgs/development/libraries/libxml2/default.nix | |
parent | f8c211fd2b53d970a439d643bea9d0928fb08666 (diff) | |
download | nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.gz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.bz2 nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.lz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.xz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.zst nixlib-38313d5d877fc421d1381971051107e4b03dc40d.zip |
libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully. libxml2Python is slightly hacky now, but it seems to work.
Diffstat (limited to 'pkgs/development/libraries/libxml2/default.nix')
-rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 2fdc198aa115..af71c05a1c87 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,14 +1,11 @@ -{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }: - -assert pythonSupport -> python != null; - -#TODO: share most stuff between python and non-python builds, perhaps via multiple-output +{ stdenv, fetchurl, zlib, xz, python, findXMLCatalogs }: let version = "2.9.2"; + inherit (stdenv.lib) optional; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "libxml2-${version}"; src = fetchurl { @@ -16,20 +13,32 @@ stdenv.mkDerivation (rec { sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "bin" "doc" "py" ]; + propagatedOutputs = "out bin py"; - buildInputs = stdenv.lib.optional pythonSupport python + buildInputs = [ 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. - ++ stdenv.lib.optional stdenv.isFreeBSD xz; + ++ optional stdenv.isFreeBSD xz; propagatedBuildInputs = [ zlib findXMLCatalogs ]; - passthru = { inherit pythonSupport version; }; + configureFlags = "--with-python=${python}"; enableParallelBuilding = true; + preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; + installFlags = ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; + + postFixup = '' + _moveToOutput bin/xml2-config "$dev" + _moveToOutput lib/xml2Conf.sh "$dev" + _moveToOutput share/man/man1 "$bin" + ''; + + passthru = { inherit version; pythonSupport = true; }; + meta = { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; @@ -37,15 +46,5 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; - -} // stdenv.lib.optionalAttrs pythonSupport { - configureFlags = "--with-python=${python}"; - - # this is a pair of ugly hacks to make python stuff install into the right place - preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"''; - installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"''; - -} // stdenv.lib.optionalAttrs (!pythonSupport) { - configureFlags = "--with-python=no"; # otherwise build impurity bites us -}) +} |