Removed my dirty hacks, because I discovered a undocumented feature in the QT configure script which picks the opensource edition
svn path=/nixpkgs/trunk/; revision=16984
This commit is contained in:
parent
edd56d707a
commit
b44d46ee21
@ -45,12 +45,11 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
|
||||
configureFlags = ''
|
||||
-prefix $out
|
||||
-v -no-separate-debug-info -release
|
||||
-system-zlib -system-libpng -system-libjpeg -fast
|
||||
-qt-gif -confirm-license
|
||||
-qt-gif -confirm-license -opensource
|
||||
-opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
|
||||
-qdbus -cups -glib -xfixes -dbus-linked
|
||||
-fontconfig -I${freetype}/include/freetype2
|
||||
@ -58,8 +57,6 @@ stdenv.mkDerivation {
|
||||
${if buildExamples == true then "" else "-nomake examples"}
|
||||
'';
|
||||
|
||||
configurePhase = "echo o | ./configure $configureFlags";
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace configure --replace /bin/pwd pwd
|
||||
sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
|
||||
|
Loading…
Reference in New Issue
Block a user