public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt: fixup from c4cac55d69 

This commit was too aggressive in adding configure flags. Only qtbsea
needs the -no-framework flag to work correctly. Qmake will handle
everything else for us.
This commit is contained in:
Matthew Bauer 2018-06-02 13:50:45 -04:00
parent 313d2f7d6b
commit dcea0913e5
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/qt-5/mkDerivation.nix
View File

@ -16,9 +16,6 @@ let
optional (!debug) "-DQT_NO_DEBUG" optional (!debug) "-DQT_NO_DEBUG"
++ lib.toList (args.NIX_CFLAGS_COMPILE or []); ++ lib.toList (args.NIX_CFLAGS_COMPILE or []);
configureFlags = [ "-no-framework" ]
++ (args.configureFlags or []);
cmakeFlags = cmakeFlags =
(args.cmakeFlags or []) (args.cmakeFlags or [])
++ [ ++ [

1
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -298,6 +298,7 @@ stdenv.mkDerivation {
"-no-fontconfig" "-no-fontconfig"
"-qt-freetype" "-qt-freetype"
"-qt-libpng" "-qt-libpng"
"-no-framework"
] ]
else else
[ [