Unverified Commit c5b69497 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

geos, proj: unpin stdenv on darwin
parents 3e3a00c1 fa0c748c

pkgs/development/libraries/geos/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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 = {

pkgs/top-level/all-packages.nix

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