ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

* Latest Qt, kdelibs.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8415
This commit is contained in:
Eelco Dolstra 2007-03-26 13:39:50 +00:00
parent b46531c506
commit fd0c8d9fc9
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/kde/kdelibs/default.nix
View File

@ -4,13 +4,15 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdelibs-3.5.0"; name = "kdelibs-3.5.6";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/kdelibs-3.5.0.tar.bz2; url = http://ftp.scarlet.be/pub/kde/stable/3.5.6/src/kdelibs-3.5.6.tar.bz2;
md5 = "2b11d654e2ea1a3cd16dcfdcbb7d1915"; sha256 = "0p0v4gr61qlvnpg9937chrjh3s7xi3nn7wvrg1xjf8dfqq164xh6";
}; };
inherit openssl libX11 libjpeg; passthru = {inherit openssl libX11 libjpeg;};
buildInputs = [ buildInputs = [
libX11 libXt libXext zlib perl qt openssl pcre libX11 libXt libXext zlib perl qt openssl pcre
pkgconfig libjpeg libpng libtiff libxml2 libxslt expat pkgconfig libjpeg libpng libtiff libxml2 libxslt expat

6
pkgs/development/libraries/qt-3/default.nix
View File

@ -16,13 +16,13 @@ assert mysqlSupport -> mysql != null;
assert openglSupport -> mesa != null && libXmu != null; assert openglSupport -> mesa != null && libXmu != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "qt-3.3.6"; name = "qt-3.3.8";
builder = ./builder.sh; builder = ./builder.sh;
hook = ./setup-hook.sh; hook = ./setup-hook.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.6.tar.bz2; url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2;
md5 = "dc1384c03ac08af21f6fefab32d982cf"; sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
}; };
buildInputs = [x11 libXft libXrender zlib libjpeg libpng which]; buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];

8
pkgs/top-level/all-packages.nix
View File

@ -470,9 +470,8 @@ rec {
}; };
qtparted = import ../tools/misc/qtparted { qtparted = import ../tools/misc/qtparted {
inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib; inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib qt3;
inherit (xlibs) libX11 libXext; inherit (xlibs) libX11 libXext;
qt3 = qt3NoMySQL;
}; };
realCurl = import ../tools/networking/curl { realCurl = import ../tools/networking/curl {
@ -1646,11 +1645,6 @@ rec {
inherit (xlibs) libXft libXrender libXrandr randrproto inherit (xlibs) libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto; libXmu libXinerama xineramaproto;
openglSupport = true; openglSupport = true;
};
qt3NoMySQL = import ../development/libraries/qt-3 {
inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql;
inherit (xlibs) libXft libXrender;
mysqlSupport = false; mysqlSupport = false;
}; };