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

Merge pull request #273444 from wegank/uri-clang 

uri: fix build on darwin
parents df774e44 4d418165

pkgs/development/libraries/uri/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -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 ];

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -20958,7 +20958,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 { };