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

qt54.qtbase: fix Qt module CMake config files

This commit is contained in:
Thomas Tuegel 2016-01-28 18:19:26 -06:00
parent f4e6b173bb
commit 65ef8578c2
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper { stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig
, srcs , srcs
, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
@ -215,7 +215,7 @@ stdenv.mkDerivation {
++ lib.optional (postgresql != null) postgresql ++ lib.optional (postgresql != null) postgresql
++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
nativeBuildInputs = [ lndir python perl pkgconfig ]; nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
# freetype-2.5.4 changed signedness of some struct fields # freetype-2.5.4 changed signedness of some struct fields
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@ -224,6 +224,19 @@ stdenv.mkDerivation {
'' ''
# Don't retain build-time dependencies like gdb and ruby. # Don't retain build-time dependencies like gdb and ruby.
sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri" sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri"
fixQtModuleCMakeConfig "Concurrent"
fixQtModuleCMakeConfig "Core"
fixQtModuleCMakeConfig "DBus"
fixQtModuleCMakeConfig "Gui"
fixQtModuleCMakeConfig "Network"
fixQtModuleCMakeConfig "OpenGL"
fixQtModuleCMakeConfig "OpenGLExtensions"
fixQtModuleCMakeConfig "PrintSupport"
fixQtModuleCMakeConfig "Sql"
fixQtModuleCMakeConfig "Test"
fixQtModuleCMakeConfig "Widgets"
fixQtModuleCMakeConfig "Xml"
''; '';
inherit lndir; inherit lndir;