mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 05:00:16 +00:00
* Fixed Qt 3.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18083
This commit is contained in:
parent
eadf38f8de
commit
8fd610bff9
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue