swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #273444 from wegank/uri-clang

Browse source 
uri: fix build on darwin
This commit is contained in:
Weijia Wang 2023-12-11 18:53:12 +01:00 committed by GitHub
parent df774e44ca 4d4181652b
commit a8dac2fa64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/uri/default.nix
View file

@ -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 ];

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };