From f5c84020ce02b2c52b4dbdae3a63978c670e9acf Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 13 Jun 2018 16:41:47 +0000 Subject: [PATCH] Revert "libxml2: add static output (#41915)" This reverts commit 819f47bb36a9fbfa833abf323b1021d36cc60030 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. --- pkgs/development/libraries/libxml2/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 1551d403247..be2f83cb498 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b"; }; - outputs = [ "bin" "dev" "out" "man" "doc" "static" ] + outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { configureFlags = lib.optional pythonSupport "--with-python=${python}" ++ lib.optional icuSupport "--with-icu" - ++ [ "--exec_prefix=$dev" "--enable-static" ]; + ++ [ "--exec_prefix=$dev" ]; enableParallelBuilding = true; @@ -59,11 +59,6 @@ in stdenv.mkDerivation rec { moveToOutput share/man/man1 "$bin" ''; - postInstall = '' - mkdir -p $static/lib - cp .libs/libxml2.a $static/lib/ - ''; - passthru = { inherit version; pythonSupport = pythonSupport; }; meta = {