From 4d4181652bcefee456400714c8bdae1a131a4710 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 14:39:27 +0100 Subject: [PATCH] uri: fix build on darwin --- pkgs/development/libraries/uri/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 51c2bcd59a57..039db9392671 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -11,12 +11,15 @@ stdenv.mkDerivation rec { sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=parentheses" # Needed with GCC 12 "-Wno-error=deprecated-declarations" "-Wno-error=nonnull" - ]; + ] ++ lib.optionals stdenv.cc.isClang [ + # Needed with Clang 16 + "-Wno-error=deprecated-builtins" + ]); nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..c33fd922154a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20953,7 +20953,7 @@ with pkgs; ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; }; - uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; }; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { };