diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-23 22:57:08 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-23 22:57:08 -0500 |
commit | 00d4968679d4943b33639891a041daa07a4f7395 (patch) | |
tree | ced7b22527e3181101454851d867a3b2f6aa437f | |
parent | ea60451259f1ee43caac36eae57adb6a12fb488a (diff) | |
parent | b6d4be13d055408c55651f45f1142aba0c26dd87 (diff) | |
download | nixlib-00d4968679d4943b33639891a041daa07a4f7395.tar nixlib-00d4968679d4943b33639891a041daa07a4f7395.tar.gz nixlib-00d4968679d4943b33639891a041daa07a4f7395.tar.bz2 nixlib-00d4968679d4943b33639891a041daa07a4f7395.tar.lz nixlib-00d4968679d4943b33639891a041daa07a4f7395.tar.xz nixlib-00d4968679d4943b33639891a041daa07a4f7395.tar.zst nixlib-00d4968679d4943b33639891a041daa07a4f7395.zip |
Merge pull request #269340 from reckenrode/postgis-fix
postgresqlPackages.postgis: fix build on clang 12+
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/postgis.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 67f7b520b898..fe6319d44f20 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; + NIX_LDFLAGS = "-L${lib.getLib json_c}/lib" + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + + lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) " -l${stdenv.cc.libcxx.cxxabi.libName}"; + preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure |