Unverified Commit e3f73c58 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

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

...into staging-next
parents 9446aa65 4bd78634

pkgs/top-level/all-packages.nix

+6 −2
Original line number Diff line number Diff line
@@ -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 { };