BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt4: another attempt to fix build on Darwin

Browse source
This commit is contained in:
Vladimír Čunát 2017-02-04 11:28:09 +01:00
parent 2ba076e99c
commit 45fcefd4be
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/qt-4.x/4.8/default.nix
View file

@ -152,7 +152,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false; enableParallelBuilding = false;
NIX_CFLAGS_COMPILE = "-std=gnu++98" NIX_CFLAGS_COMPILE =
optionalString stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
+ optionalString (stdenv.isFreeBSD || stdenv.isDarwin) + optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
" -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" " -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
+ optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1"; + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1";