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

Merge #264830: geos, proj: build with clang <=14 on darwin

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát
2023-11-05 16:02:48 +01:00
parent 9446aa65ea 4bd7863405
commit e3f73c585a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+6 -2
View File
@@ -21508,7 +21508,9 @@ with pkgs;
geomyidae = callPackage ../applications/networking/gopher/geomyidae { };
geos = callPackage ../development/libraries/geos { };
geos = callPackage ../development/libraries/geos {
stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv;
};
geos39 = callPackage ../development/libraries/geos/3.9.nix { };
@@ -24614,7 +24616,9 @@ with pkgs;
primesieve = callPackage ../applications/science/math/primesieve { };
proj = callPackage ../development/libraries/proj { };
proj = callPackage ../development/libraries/proj {
stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv;
};
proj_7 = callPackage ../development/libraries/proj/7.nix { };