diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 01:40:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:10:18 +0100 |
| commit | ab0cfd9e036ca83bdffb8790f7cf45179441cd93 (patch) | |
| tree | 006ede78e54ee19818bb6e6830e0c2a6f93f05f2 /pkgs/development/libraries/qt-4.x | |
| parent | 981ae25113c13b7989e89b8b57be25d9e186a63e (diff) | |
| download | nixpkgs-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar nixpkgs-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.gz nixpkgs-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.bz2 nixpkgs-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.lz nixpkgs-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.xz nixpkgs-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.zst nixpkgs-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.zip | |
treewide: NIX_*_COMPILE -> string
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 |
1 files changed, 2 insertions, 2 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 632b5fc1fd5..25953949eb7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -206,13 +206,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( # with gcc7 the warnings blow the log over Hydra's limit [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ] ++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin ++ lib.optionals (stdenv.isFreeBSD || stdenv.isDarwin) [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ] - ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"); NIX_LDFLAGS = lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; |