From 724e833ea2a9d1b16f7289e1244d0d7ff56d027b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 22 Apr 2019 22:36:35 -0400 Subject: [PATCH] treewide: disable -Werror for llvm 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of these have errors on newest llvm. It’s easiest to just add -Wno-error in these cases. --- pkgs/applications/graphics/imgcat/default.nix | 2 ++ pkgs/applications/science/astronomy/xplanet/default.nix | 2 ++ pkgs/applications/science/biology/cmtk/default.nix | 2 ++ pkgs/development/libraries/bullet/default.nix | 2 ++ pkgs/development/libraries/clucene-core/2.x.nix | 2 ++ pkgs/tools/archivers/p7zip/default.nix | 2 ++ pkgs/tools/compression/pbzip2/default.nix | 2 ++ pkgs/tools/misc/toybox/default.nix | 2 ++ pkgs/tools/networking/ntopng/default.nix | 2 +- pkgs/tools/security/opensc/default.nix | 2 ++ 10 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index a98029dd5807..862d3a9dff5e 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0m83c33rzxvs0w214njql2c7q3fg06wnyijch3l2s88i7frl121f"; }; + NIX_CFLAGS_COMPILE = "-Wno-error"; + meta = with stdenv.lib; { description = "It's like cat, but for images"; homepage = https://github.com/eddieantonio/imgcat; diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 7abd83b6dc12..aae9adfed67a 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { ./gcc6.patch ]; + NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + meta = { description = "Renders an image of the earth or other planets into the X root window"; homepage = http://xplanet.sourceforge.net; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index ed661db23e0a..90766645ecb3 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [cmake]; + NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + meta = with stdenv.lib; { description = "Computational Morphometry Toolkit "; longDescription = ''A software toolkit for computational morphometry of diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index fca5e8d70a3b..585e2416b993 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-Wno-error=argument-outside-range"; + meta = with stdenv.lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 6eb310550bcd..03276ce9efd2 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { # /build/clucene-core-2.3.3.4/build/bin/cl_test" doCheck = false; + NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + meta = with stdenv.lib; { description = "Core library for full-featured text search engine"; longDescription = '' diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 5430c2cb73e7..3dac4245de4e 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + meta = { homepage = http://p7zip.sourceforge.net/; description = "A port of the 7-zip archiver"; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index fb3da5e48d68..c7c1b7efc944 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=$(out)"; + NIX_CFLAGS_COMPILE = "-Wno-error=reserved-user-defined-literal"; + meta = with stdenv.lib; { homepage = http://compression.ca/pbzip2/; description = "A parallel implementation of bzip2 for multi-core machines"; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 98fa06bccfd6..1b518be63a5e 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ]; checkTarget = "tests"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + meta = with stdenv.lib; { description = "Lightweight implementation of some Unix command line utilities"; homepage = https://landley.net/toybox/; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index b307a8f6f131..b1e1bfcdd65e 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { sed 's|LIBS += -lstdc++.6||' -i Makefile ''; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" "-Wno-error=reserved-user-defined-literal" ]; meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 7d709712fc80..3144665e4ec9 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { libXt libxslt libiconv docbook_xml_dtd_412 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; + NIX_CFLAGS_COMPILE = "-Wno-error"; + configureFlags = [ "--enable-zlib" "--enable-readline"