diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-11-11 15:56:30 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-11-11 15:56:30 +0000 |
| commit | 17b0f144f71549458898a6cf9d176d349318b7d5 (patch) | |
| tree | bfbe7afed7e8cc602ceb7465d7934867a5cb5ad7 /pkgs/development/libraries | |
| parent | 913cc6983eaa2fa2d035885c37f84437ad3da138 (diff) | |
| download | nixpkgs-17b0f144f71549458898a6cf9d176d349318b7d5.tar nixpkgs-17b0f144f71549458898a6cf9d176d349318b7d5.tar.gz nixpkgs-17b0f144f71549458898a6cf9d176d349318b7d5.tar.bz2 nixpkgs-17b0f144f71549458898a6cf9d176d349318b7d5.tar.lz nixpkgs-17b0f144f71549458898a6cf9d176d349318b7d5.tar.xz nixpkgs-17b0f144f71549458898a6cf9d176d349318b7d5.tar.zst nixpkgs-17b0f144f71549458898a6cf9d176d349318b7d5.zip | |
qt-4 (kde version) upgrade, added libtiff to qt-4 dependencies
svn path=/nixpkgs/trunk/; revision=9632
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-4/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix index 38b1b2b9da7..20893e8d8d9 100644 --- a/pkgs/development/libraries/qt-4/default.nix +++ b/pkgs/development/libraries/qt-4/default.nix @@ -5,14 +5,14 @@ rec { propagatedBuildInputs = [libXft libXrender libXrandr randrproto xextproto libXinerama xineramaproto libXcursor zlib libjpeg mysql libpng which mesa libXmu openssl dbus cups pkgconfig libXext freetype fontconfig inputproto - fixesproto libXfixes glib]; + fixesproto libXfixes glib libtiff]; prefixKey = "-prefix "; configureFlags = " -v -no-separate-debug-info -release -nomake examples -nomake demos -system-zlib -system-libpng -system-libjpeg -fast -qt-gif -confirm-license -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql - -L${mysql}/lib/mysql -I${mysql}/include/mysql -qdbus -cups -glib -xfixes + -qdbus -cups -glib -xfixes -fontconfig -I${freetype}/include/freetype2"; patchPhase = "sed -e 's@/bin/pwd@pwd@' -i configure; sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf"; }; in @@ -29,9 +29,10 @@ rec { name = "qt-kde-4.3svn"; src = fetchsvn { url = svn://anonsvn.kde.org/home/kde/trunk/qt-copy; - md5 = "b0588d8ef36642613bdb92930a2330b4"; + rev = "732646"; + md5 = "9757de3dce16b483f2f358d287c848ee"; }; - patchPhase = "mkdir .svn; bash apply_patches;patch -R -p0 < patches/0172-prefer-xrandr-over-xinerama.diff;" + common.patchPhase; + patchPhase = "mkdir .svn; bash apply_patches;" + common.patchPhase; }); default = kde; } |