qt4: disable warnings to fit log on Hydra
Also convert flags to list of nix strings.
This commit is contained in:
parent
d4f1587da5
commit
44a2012ccc
|
@ -176,13 +176,14 @@ stdenv.mkDerivation rec {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE =
|
NIX_CFLAGS_COMPILE =
|
||||||
optionalString stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
|
# with gcc7 the warnings blow the log over Hydra's limit
|
||||||
+ optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
|
[ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ]
|
||||||
" -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
|
++ optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
|
||||||
+ optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1";
|
++ 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)
|
NIX_LDFLAGS = optional (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0";
|
||||||
"-lglib-2.0";
|
|
||||||
|
|
||||||
preBuild = optionalString stdenv.isDarwin ''
|
preBuild = optionalString stdenv.isDarwin ''
|
||||||
# resolve "extra qualification on member" error
|
# resolve "extra qualification on member" error
|
||||||
|
|
Loading…
Reference in New Issue