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

* Build Qt with GIF, Xcursor, Xshape support.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8419
This commit is contained in:
Eelco Dolstra 2007-03-26 18:15:32 +00:00
parent bd6a683c4c
commit 0389ffe877
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,15 +3,17 @@
, 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, xineramaproto ? null
, cursorSupport ? true, libXcursor ? null
, threadSupport ? true , threadSupport ? true
, mysqlSupport ? true, mysql ? null , mysqlSupport ? true, mysql ? null
, openglSupport ? false, mesa ? null, libXmu ? null , openglSupport ? false, mesa ? null, libXmu ? null
, x11, zlib, libjpeg, libpng, which , x11, xextproto, zlib, libjpeg, libpng, which
}: }:
assert xftSupport -> libXft != null; assert xftSupport -> libXft != null;
assert xrenderSupport -> xftSupport && libXrender != null; assert xrenderSupport -> xftSupport && libXrender != null;
assert xrandrSupport -> libXrandr != null && randrproto != null; assert xrandrSupport -> libXrandr != null && randrproto != null;
assert cursorSupport -> libXcursor != null;
assert mysqlSupport -> mysql != null; assert mysqlSupport -> mysql != null;
assert openglSupport -> mesa != null && libXmu != null; assert openglSupport -> mesa != null && libXmu != null;
@ -30,6 +32,8 @@ stdenv.mkDerivation {
configureFlags = " configureFlags = "
-v -v
-system-zlib -system-libpng -system-libjpeg -system-zlib -system-libpng -system-libjpeg
-qt-gif
-I${xextproto}/include
${if openglSupport then "-dlopen-opengl ${if openglSupport then "-dlopen-opengl
-L${mesa}/lib -I${mesa}/include -L${mesa}/lib -I${mesa}/include
-L${libXmu}/lib -I${libXmu}/include" else ""} -L${libXmu}/lib -I${libXmu}/include" else ""}
@ -39,6 +43,7 @@ stdenv.mkDerivation {
-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${xineramaproto}/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 mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""}
${if xftSupport then "-xft ${if xftSupport then "-xft
-L${libXft}/lib -I${libXft}/include -L${libXft}/lib -I${libXft}/include

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

@ -1642,8 +1642,8 @@ rec {
qt3 = import ../development/libraries/qt-3 { 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) libXft libXrender libXrandr randrproto inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto; libXmu libXinerama xineramaproto libXcursor;
openglSupport = true; openglSupport = true;
mysqlSupport = false; mysqlSupport = false;
}; };