diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-09-08 09:50:06 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-09-08 09:50:06 +0000 |
| commit | b44d46ee2106180dc13cc3d1b8d45874495a4b61 (patch) | |
| tree | 20ebe21d5f78dab1956bad77393158c1b36c24a0 | |
| parent | edd56d707a3bb29309d3b41c80a7dbd50eafea71 (diff) | |
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
| -rw-r--r-- | pkgs/development/libraries/qt-4.5/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-4.5/default.nix b/pkgs/development/libraries/qt-4.5/default.nix index 32e4e095df77b..87381988c821d 100644 --- a/pkgs/development/libraries/qt-4.5/default.nix +++ b/pkgs/development/libraries/qt-4.5/default.nix @@ -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 |