diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 10:16:21 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 10:16:21 +0100 |
| commit | 44a2012ccc8ffb03d2eb159126adc9b7422a0538 (patch) | |
| tree | 1bf26286c3b952df89d3e54f983b3bf88171382a /pkgs/development/libraries/qt-4.x | |
| parent | d4f1587da54f1d239752c2d46191eccf71a56853 (diff) | |
| download | nixpkgs-44a2012ccc8ffb03d2eb159126adc9b7422a0538.tar nixpkgs-44a2012ccc8ffb03d2eb159126adc9b7422a0538.tar.gz nixpkgs-44a2012ccc8ffb03d2eb159126adc9b7422a0538.tar.bz2 nixpkgs-44a2012ccc8ffb03d2eb159126adc9b7422a0538.tar.lz nixpkgs-44a2012ccc8ffb03d2eb159126adc9b7422a0538.tar.xz nixpkgs-44a2012ccc8ffb03d2eb159126adc9b7422a0538.tar.zst nixpkgs-44a2012ccc8ffb03d2eb159126adc9b7422a0538.zip | |
qt4: disable warnings to fit log on Hydra
Also convert flags to list of nix strings.
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 15 |
1 files changed, 8 insertions, 7 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"; - - NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - "-lglib-2.0"; + # 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 = optional (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; preBuild = optionalString stdenv.isDarwin '' # resolve "extra qualification on member" error |