From cc07ec890d0e7b31d7154f1bce6d3ba19aae5a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 30 Jan 2017 15:23:34 +0100 Subject: [PATCH] protobuf-3.x: fixup build with default gcc version /cc @globin a3a0e8fe6. http://hydra.nixos.org/build/47266085 --- pkgs/development/libraries/protobuf/generic-v3.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 315608bf2b4f..39cf0a1741d6 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation"; + NIX_CFLAGS_COMPILE = with stdenv.lib; + # gcc before 6 doesn't know this option + optionalString (hasPrefix "gcc-6" stdenv.cc.cc) "-Wno-error=misleading-indentation"; meta = { description = "Google's data interchange format";