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

Merge pull request #303941 from wegank/proj-clang-16 

geos, proj: unpin stdenv on darwin
This commit is contained in:
Weijia Wang 2024-04-15 03:09:17 +02:00 committed by GitHub
parent 3e3a00c1f3 fa0c748ce3
commit c5b6949790
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/geos/default.nix
View File

@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
# https://github.com/libgeos/geos/issues/930
cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope"
];
doCheck = true;
passthru.tests = {

8
pkgs/top-level/all-packages.nix
View File

@ -21072,9 +21072,7 @@ with pkgs;
geomyidae = callPackage ../applications/networking/gopher/geomyidae { };
geos = callPackage ../development/libraries/geos {
stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv;
};
geos = callPackage ../development/libraries/geos { };
geos_3_9 = callPackage ../development/libraries/geos/3.9.nix { };
@ -24047,9 +24045,7 @@ with pkgs;
prime-server = callPackage ../development/libraries/prime-server { };
proj = callPackage ../development/libraries/proj {
stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv;
};
proj = callPackage ../development/libraries/proj { };
proj_7 = callPackage ../development/libraries/proj/7.nix { };