From 44a2012ccc8ffb03d2eb159126adc9b7422a0538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Feb 2018 10:16:21 +0100 Subject: [PATCH] qt4: disable warnings to fit log on Hydra Also convert flags to list of nix strings. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 46f24a08b5e..05b2c582cc2 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -176,13 +176,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; NIX_CFLAGS_COMPILE = - optionalString stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin - + optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - " -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" - + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1"; + # with gcc7 the warnings blow the log over Hydra's limit + [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ] + ++ optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin + ++ optionals (stdenv.isFreeBSD || stdenv.isDarwin) + [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ] + ++ optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - "-lglib-2.0"; + NIX_LDFLAGS = optional (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; preBuild = optionalString stdenv.isDarwin '' # resolve "extra qualification on member" error