diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-05 14:21:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 14:21:01 -0500 |
| commit | eac23aa072f531e309dc4198cb979432a931ddf7 (patch) | |
| tree | 5b3d5c4adc48f6052334aadef88d12b209eebd60 | |
| parent | slack: 4.34.120 -> 4.32.121 (diff) | |
| parent | grpc: add missing whitespace in aarch64-darwin NIX_CFLAGS_COMPILE (#256057) (diff) | |
| download | nixpkgs-eac23aa072f531e309dc4198cb979432a931ddf7.tar.gz | |
Merge pull request #265674 from notalltim/backport-256057-to-release-23.05
backport #256057
| -rw-r--r-- | pkgs/development/libraries/grpc/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 7ba6ec214cd0..3aeabcd18991 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -76,8 +76,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; |