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

* Fixed Qt 3.

Browse Source 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18083
This commit is contained in:
Eelco Dolstra 2009-11-03 21:55:53 +00:00
parent eadf38f8de
commit 8fd610bff9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, xftSupport ? true, libXft ? null , xftSupport ? true, libXft ? null
, xrenderSupport ? true, libXrender ? null , xrenderSupport ? true, libXrender ? null
, xrandrSupport ? true, libXrandr ? null, randrproto ? null , xrandrSupport ? true, libXrandr ? null, randrproto ? null
, xineramaSupport ? true, libXinerama ? null, xineramaproto ? null , xineramaSupport ? true, libXinerama ? null
, cursorSupport ? true, libXcursor ? null , cursorSupport ? true, libXcursor ? null
, threadSupport ? true , threadSupport ? true
, mysqlSupport ? true, mysql ? null , mysqlSupport ? true, mysql ? null
@ -44,7 +44,7 @@ stdenv.mkDerivation {
${if xrandrSupport then "-xrandr ${if xrandrSupport then "-xrandr
-L${libXrandr}/lib -I${libXrandr}/include -L${libXrandr}/lib -I${libXrandr}/include
-I${randrproto}/include" else "-no-xrandr"} -I${randrproto}/include" else "-no-xrandr"}
${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${xineramaproto}/include" else "-no-xinerama"} ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"}
${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""} ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""} ${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""}
${if xftSupport then "-xft ${if xftSupport then "-xft

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

@ -4344,7 +4344,7 @@ let
qt3 = makeOverridable (import ../development/libraries/qt-3) { qt3 = makeOverridable (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 libXcursor;
openglSupport = mesaSupported; openglSupport = mesaSupported;
mysqlSupport = getConfig ["qt" "mysql"] false; mysqlSupport = getConfig ["qt" "mysql"] false;
}; };