From bb52ff3df82c44205f34e7fe5e14422f3367b3b9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 18 Feb 2019 20:31:09 -0500 Subject: [PATCH] postgresql: Don't move libs unnecessarily out of $lib. In particular, when static linking pkgconfig expects libpq.a in $lib --- pkgs/servers/sql/postgresql/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 7b92d756da5c..b61382974b7a 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -76,7 +76,8 @@ let postInstall = '' moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it - moveToOutput "lib/*.a" "$out" + moveToOutput "lib/libpgcommon.a" "$out" + moveToOutput "lib/libpgport.a" "$out" moveToOutput "lib/libecpg*" "$out" # Prevent a retained dependency on gcc-wrapper. @@ -84,7 +85,7 @@ let if [ -z "''${dontDisableStatic:-}" ]; then # Remove static libraries in case dynamic are available. - for i in $out/lib/*.a; do + for i in $out/lib/*.a $lib/lib/*.a; do name="$(basename "$i")" ext="${stdenv.hostPlatform.extensions.sharedLibrary}" if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then