Author: eelco
Date: Thu Jul 7 12:13:16 2011
New Revision: 27619
URL: https://svn.nixos.org/websvn/nix/?rev=27619&sc=1
Log:
* Qt 4.7.3.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
Thu Jul 7 11:28:53 2011 (r27618)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
Thu Jul 7 12:13:16 2011 (r27619)
@@ -5,10 +5,11 @@
, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig,
libtiff, glib
, mysql, postgresql, sqlite
, perl, coreutils, libXi
-, buildDemos ? false, buildExamples ? false, useDocs ? true}:
+, buildDemos ? false, buildExamples ? false, useDocs ? false
+}:
let
- v = "4.7.2";
+ v = "4.7.3";
in
stdenv.mkDerivation rec {
@@ -16,12 +17,29 @@
src = fetchurl {
url =
"ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";;
- sha256 = "0dlknhzcslymqbmlkpmmgv29c5mmbw6s7rznriqd5g4h9d93ny6l";
+ sha256 = "0zlk0lcrkhi8wdb5j2lqz3nclk07blbiial7lzs03708kpb6yayh";
};
- preConfigure = ''
- export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
- configureFlags+="
+ preConfigure =
+ ''
+ export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+ '';
+
+ configureFlags =
+ ''
+ -v -no-separate-debug-info -release -fast -confirm-license -opensource
+ -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
+ -opengl -xrender -xrandr -xinerama -xcursor
+ -plugin-sql-mysql -system-sqlite
+ -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
+ -fontconfig -I${freetype}/include/freetype2
+ -exceptions -xmlpatterns
+ -multimedia -audio-backend -phonon -phonon-backend
+ -webkit -javascript-jit
+ -make libs -make tools -make translations
+ ${if buildDemos == true then "-make demos" else "-nomake demos"}
+ ${if buildExamples == true then "-make examples" else "-nomake examples"}
+ ${if useDocs then "-make docs" else "-nomake docs"}
-docdir $out/share/doc/${name}
-plugindir $out/lib/qt4/plugins
-importdir $out/lib/qt4/imports
@@ -29,8 +47,7 @@
-demosdir $out/share/doc/${name}/demos
-datadir $out/share/${name}
-translationdir $out/share/${name}/translations
- "
- '';
+ '';
propagatedBuildInputs = [
alsaLib
@@ -75,21 +92,6 @@
prefixKey = "-prefix ";
- configureFlags = ''
- -v -no-separate-debug-info -release -fast -confirm-license -opensource
- -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
- -opengl -xrender -xrandr -xinerama -xcursor
- -plugin-sql-mysql -system-sqlite
- -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
- -fontconfig -I${freetype}/include/freetype2
- -exceptions -xmlpatterns
- -multimedia -audio-backend -phonon -phonon-backend
- -webkit -javascript-jit
- -make libs -make tools -make translations
- ${if buildDemos == true then "-make demos" else "-nomake demos"}
- ${if buildExamples == true then "-make examples" else "-nomake examples"}
- ${if useDocs then "-make docs" else "-nomake docs"}'';
-
prePatch = ''
substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace src/corelib/global/global.pri --replace /bin/ls
${coreutils}/bin/ls
@@ -98,7 +100,8 @@
postInstall = ''
${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
- ln -sv phonon $out/include/Phonon'';
+ ln -sv phonon $out/include/Phonon
+ '';
enableParallelBuilding = true;
@@ -108,6 +111,5 @@
license = "GPL/LGPL";
maintainers = with maintainers; [ urkud sander ];
platforms = platforms.linux;
- priority = 10;
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
