diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
| commit | ea2acbed493e218f696673a004a95829392c5e33 (patch) | |
| tree | c5716552f205bbf4d4addfa4675ea5073786bd06 /nixpkgs/pkgs/development/libraries/grpc | |
| parent | 06ba6c84f858b011fb1132721e5d5e28fcda4a8a (diff) | |
| parent | 8aa8cd68f4745eb92f003666bfd300f3e67cd9c1 (diff) | |
| download | nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.gz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.bz2 nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.lz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.xz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.zst nixlib-ea2acbed493e218f696673a004a95829392c5e33.zip | |
Merge branch 'staging' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/grpc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/grpc/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index 77bba280df96..0532907ac153 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -94,8 +94,13 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option" - + lib.optionalString stdenv.isAarch64 "-Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( + lib.optionals stdenv.cc.isClang [ + "-Wno-error=unknown-warning-option" + ] ++ lib.optionals stdenv.isAarch64 [ + "-Wno-error=format-security" + ] + ); enableParallelBuilds = true; |