colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* qt-4 -> qt-4.4.

Browse Source 
* kde-4.2 shouldn't depend on poppler built with qt 4.5.

svn path=/nixpkgs/trunk/; revision=17084
This commit is contained in:
Eelco Dolstra 2009-09-13 11:04:54 +00:00
parent a54fc7e7f7
commit 5d0b5d06e9
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.2/default.nix
View File

@ -1,6 +1,8 @@
pkgs: pkgs:
rec { rec {
inherit (pkgs) qt4;
### SUPPORT ### SUPPORT
automoc4 = import ./support/automoc4 { automoc4 = import ./support/automoc4 {
inherit (pkgs) stdenv fetchurl cmake; inherit (pkgs) stdenv fetchurl cmake;

2
pkgs/desktops/kde-4.3/default.nix
View File

@ -1,6 +1,8 @@
pkgs: pkgs:
rec { rec {
inherit (pkgs) qt4;
### SUPPORT ### SUPPORT
automoc4 = import ./support/automoc4 { automoc4 = import ./support/automoc4 {
inherit (pkgs) stdenv fetchurl lib cmake; inherit (pkgs) stdenv fetchurl lib cmake;

0
pkgs/development/libraries/qt-4/default.nix → pkgs/development/libraries/qt-4.4/default.nix
View File

0
pkgs/development/libraries/qt-4/setup-hook.sh → pkgs/development/libraries/qt-4.4/setup-hook.sh
View File

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

@ -3997,21 +3997,22 @@ let
dbus = dbus.libs; dbus = dbus.libs;
}; };
poppler = import ../development/libraries/poppler { poppler = makeOverridable (import ../development/libraries/poppler) {
inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg inherit fetchurl stdenv cairo freetype fontconfig zlib libjpeg pkgconfig;
pkgconfig;
inherit (gtkLibs) glib gtk; inherit (gtkLibs) glib gtk;
qt4Support = getConfig [ "poppler" "qt4Support" ] false; qt4Support = false;
}; };
popplerQt4 = import ../development/libraries/poppler { popplerQt44 = poppler.override {
inherit fetchurl stdenv cairo freetype fontconfig zlib libjpeg
pkgconfig;
qt4 = qt45;
inherit (gtkLibs) glib gtk;
qt4Support = true; qt4Support = true;
qt4 = qt44;
}; };
popplerQt45 = poppler.override {
qt4Support = true;
qt4 = qt45;
};
popt = import ../development/libraries/popt { popt = import ../development/libraries/popt {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -4040,21 +4041,23 @@ let
mysqlSupport = true; mysqlSupport = true;
}; };
qt4 = import ../development/libraries/qt-4 { qt4 = qt44;
qt44 = import ../development/libraries/qt-4.4 {
inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig libtiff; fontconfig freetype pkgconfig libtiff;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
inputproto fixesproto libXfixes; inputproto fixesproto libXfixes;
inherit (gnome) glib; inherit (gnome) glib;
}; };
qt45 = import ../development/libraries/qt-4.5 { qt45 = import ../development/libraries/qt-4.5 {
inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig libtiff; fontconfig freetype pkgconfig libtiff;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor libXext libXmu libXinerama xineramaproto libXcursor libXext
inputproto fixesproto libXfixes; inputproto fixesproto libXfixes;
inherit (gnome) glib; inherit (gnome) glib;
}; };
@ -7851,11 +7854,14 @@ let
kde42 = import ../desktops/kde-4.2 (pkgs // { kde42 = import ../desktops/kde-4.2 (pkgs // {
openexr = openexr_1_6_1; openexr = openexr_1_6_1;
qt4 = qt44;
popplerQt4 = popplerQt44;
}); });
kde43 = import ../desktops/kde-4.3 (pkgs // { kde43 = import ../desktops/kde-4.3 (pkgs // {
openexr = openexr_1_6_1; openexr = openexr_1_6_1;
qt4 = qt45; qt4 = qt45;
popplerQt4 = popplerQt45;
}); });
kdelibs = kde3.kdelibs; kdelibs = kde3.kdelibs;