public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protobuf, perf: fix my bad condition on gcc version

Browse Source
This commit is contained in:
Vladimír Čunát
2017-02-04 20:58:47 +01:00
parent d2a571aacd
commit 73d798549f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/protobuf/generic-v3.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = with stdenv.lib; NIX_CFLAGS_COMPILE = with stdenv.lib;
# gcc before 6 doesn't know this option # gcc before 6 doesn't know this option
optionalString (hasPrefix "gcc-6" stdenv.cc.cc) "-Wno-error=misleading-indentation"; optionalString (hasPrefix "gcc-6" stdenv.cc.cc.name) "-Wno-error=misleading-indentation";
meta = { meta = {
description = "Google's data interchange format"; description = "Google's data interchange format";
pkgs/os-specific/linux/kernel/perf.nix
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
"-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations"
] ]
# gcc before 6 doesn't know these options # gcc before 6 doesn't know these options
++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc) [ ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [
"-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
]; ];