summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeuner <github@quidecco.de>2023-09-20 09:12:40 +0200
committerTimothy Gallion <timbama@gmail.com>2023-11-05 10:10:22 -0500
commit298479f1cd4098c76fece3d76c686062d0e7f443 (patch)
tree95b25b6f8dd83f0abbd03f6949139d67461c0d5f
parentMerge pull request #265527 from emilylange/backport-265263-to-release-23.05 (diff)
downloadnixpkgs-298479f1cd4098c76fece3d76c686062d0e7f443.tar.gz
grpc: add missing whitespace in aarch64-darwin NIX_CFLAGS_COMPILE (#256057)
Co-authored-by: Isidor Zeuner <nix@quidecco.pl>
-rw-r--r--pkgs/development/libraries/grpc/default.nix9
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;