diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-03 21:55:53 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-03 21:55:53 +0000 |
commit | 8fd610bff97c93953b45fc3f927705c374e5fb7a (patch) | |
tree | 69529be0fe67ba65c097676c700d3d3650d9d46c /pkgs | |
parent | eadf38f8de8be122d8b9a98b6feb41a8b686ba59 (diff) | |
download | nixlib-8fd610bff97c93953b45fc3f927705c374e5fb7a.tar nixlib-8fd610bff97c93953b45fc3f927705c374e5fb7a.tar.gz nixlib-8fd610bff97c93953b45fc3f927705c374e5fb7a.tar.bz2 nixlib-8fd610bff97c93953b45fc3f927705c374e5fb7a.tar.lz nixlib-8fd610bff97c93953b45fc3f927705c374e5fb7a.tar.xz nixlib-8fd610bff97c93953b45fc3f927705c374e5fb7a.tar.zst nixlib-8fd610bff97c93953b45fc3f927705c374e5fb7a.zip |
* Fixed Qt 3.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18083
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index e1bc3f897418..64b984c3f3af 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -2,7 +2,7 @@ , xftSupport ? true, libXft ? null , xrenderSupport ? true, libXrender ? null , xrandrSupport ? true, libXrandr ? null, randrproto ? null -, xineramaSupport ? true, libXinerama ? null, xineramaproto ? null +, xineramaSupport ? true, libXinerama ? null , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? true, mysql ? null @@ -44,7 +44,7 @@ stdenv.mkDerivation { ${if xrandrSupport then "-xrandr -L${libXrandr}/lib -I${libXrandr}/include -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 mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""} ${if xftSupport then "-xft diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a093bca740a8..9393b08deb03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4344,7 +4344,7 @@ let qt3 = makeOverridable (import ../development/libraries/qt-3) { inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; inherit (xlibs) xextproto libXft libXrender libXrandr randrproto - libXmu libXinerama xineramaproto libXcursor; + libXmu libXinerama libXcursor; openglSupport = mesaSupported; mysqlSupport = getConfig ["qt" "mysql"] false; }; |