From dea05953a767f0394768a2dc00916f1ae01699c4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 4 Nov 2023 17:16:25 +0100 Subject: [PATCH 1/2] proj: build with clang 13 on darwin --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d617407db479..52e689c749c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24619,7 +24619,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 { }; From 4bd78634059ccfad8b29a1604d30d706243511d7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Nov 2023 15:44:18 +0100 Subject: [PATCH 2/2] geos: build with clang 14 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e689c749c8..59b2f5a4ab72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21512,7 +21512,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 { };