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

Removed my dirty hacks, because I discovered a undocumented feature in the QT configure script which picks the opensource edition

Browse Source 
svn path=/nixpkgs/trunk/; revision=16984
This commit is contained in:
Sander van der Burg 2009-09-08 09:50:06 +00:00
parent edd56d707a
commit b44d46ee21
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qt-4.5/default.nix
View File

@ -45,12 +45,11 @@ stdenv.mkDerivation {
]; ];
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = '' configureFlags = ''
-prefix $out
-v -no-separate-debug-info -release -v -no-separate-debug-info -release
-system-zlib -system-libpng -system-libjpeg -fast -system-zlib -system-libpng -system-libjpeg -fast
-qt-gif -confirm-license -qt-gif -confirm-license -opensource
-opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-qdbus -cups -glib -xfixes -dbus-linked -qdbus -cups -glib -xfixes -dbus-linked
-fontconfig -I${freetype}/include/freetype2 -fontconfig -I${freetype}/include/freetype2
@ -58,8 +57,6 @@ stdenv.mkDerivation {
${if buildExamples == true then "" else "-nomake examples"} ${if buildExamples == true then "" else "-nomake examples"}
''; '';
configurePhase = "echo o | ./configure $configureFlags";
patchPhase = '' patchPhase = ''
substituteInPlace configure --replace /bin/pwd pwd substituteInPlace configure --replace /bin/pwd pwd
sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf