alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Use makeOverridable for the QT3 variants.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15194
This commit is contained in:
Eelco Dolstra 2009-04-20 18:07:09 +00:00
parent 1807907e6d
commit f14537a896
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/top-level/all-packages.nix
View file

@ -3805,16 +3805,7 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
qt3gcc33 = import ../development/libraries/qt-3 { qt3 = makeOverridable (import ../development/libraries/qt-3) {
stdenv = overrideGCC stdenv gcc33;
inherit fetchurl x11 zlib libjpeg libpng which mysql mesa;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor;
openglSupport = false;
mysqlSupport = false;
};
qt3 = import ../development/libraries/qt-3 {
inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor; libXmu libXinerama xineramaproto libXcursor;
@ -3822,11 +3813,13 @@ let
mysqlSupport = getConfig ["qt" "mysql"] false; mysqlSupport = getConfig ["qt" "mysql"] false;
}; };
qt3mysql = import ../development/libraries/qt-3 { qt3gcc33 = qt3.override {
inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; stdenv = overrideGCC stdenv gcc33;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto openglSupport = false;
libXmu libXinerama xineramaproto libXcursor; mysqlSupport = false;
openglSupport = mesaSupported; };
qt3mysql = qt3.override {
mysqlSupport = true; mysqlSupport = true;
}; };