diff options
| author | Shea Levy <shea@shealevy.com> | 2019-02-18 20:31:09 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2019-02-18 20:31:09 -0500 |
| commit | bb52ff3df82c44205f34e7fe5e14422f3367b3b9 (patch) | |
| tree | e72fc09920ced936e5c6beae0877d41ef849ae12 /pkgs/servers/sql | |
| parent | 266315c91d5e4a6d7b8465eb44d4f6af30d90b30 (diff) | |
| download | nixlib-bb52ff3df82c44205f34e7fe5e14422f3367b3b9.tar nixlib-bb52ff3df82c44205f34e7fe5e14422f3367b3b9.tar.gz nixlib-bb52ff3df82c44205f34e7fe5e14422f3367b3b9.tar.bz2 nixlib-bb52ff3df82c44205f34e7fe5e14422f3367b3b9.tar.lz nixlib-bb52ff3df82c44205f34e7fe5e14422f3367b3b9.tar.xz nixlib-bb52ff3df82c44205f34e7fe5e14422f3367b3b9.tar.zst nixlib-bb52ff3df82c44205f34e7fe5e14422f3367b3b9.zip | |
postgresql: Don't move libs unnecessarily out of $lib.
In particular, when static linking pkgconfig expects libpq.a in $lib
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 5 |
1 files 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 |