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

Revert "libxml2: add static output (#41915)"

Browse Source 
This reverts commit 819f47bb36 on staging to
prevent unneeded rebuild.

That change leaves the static library in two outputs, "out" and "static", and
has to be reimplemented and motivated.
This commit is contained in:
Orivej Desh
2018-06-13 16:41:47 +00:00
parent 819f47bb36
commit f5c84020ce
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libxml2/default.nix
+2 -7
View File
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b"; sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b";
}; };
outputs = [ "bin" "dev" "out" "man" "doc" "static" ] outputs = [ "bin" "dev" "out" "man" "doc" ]
++ lib.optional pythonSupport "py"; ++ lib.optional pythonSupport "py";
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
configureFlags = configureFlags =
lib.optional pythonSupport "--with-python=${python}" lib.optional pythonSupport "--with-python=${python}"
++ lib.optional icuSupport "--with-icu" ++ lib.optional icuSupport "--with-icu"
++ [ "--exec_prefix=$dev" "--enable-static" ]; ++ [ "--exec_prefix=$dev" ];
enableParallelBuilding = true; enableParallelBuilding = true;
@@ -59,11 +59,6 @@ in stdenv.mkDerivation rec {
moveToOutput share/man/man1 "$bin" moveToOutput share/man/man1 "$bin"
''; '';
postInstall = ''
mkdir -p $static/lib
cp .libs/libxml2.a $static/lib/
'';
passthru = { inherit version; pythonSupport = pythonSupport; }; passthru = { inherit version; pythonSupport = pythonSupport; };
meta = { meta = {