Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Optionally enable thread support in Qt (libqt-mt).

Browse Source 
svn path=/nixpkgs/trunk/; revision=2072
This commit is contained in:
Eelco Dolstra
2005-01-20 14:23:34 +00:00
parent 043ac4d1b0
commit 8882b48fb0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/qt-3/builder.sh
View File

@@ -23,6 +23,12 @@ preConfigure() {
configureFlags="-v -prefix $out -system-zlib -system-libpng -system-libjpeg" configureFlags="-v -prefix $out -system-zlib -system-libpng -system-libjpeg"
dontAddPrefix=1 dontAddPrefix=1
if test -n "$threadSupport"; then
configureFlags="-thread";
else
configureFlags="-no-thread";
fi
if test -n "$xftSupport"; then if test -n "$xftSupport"; then
configureFlags="-xft -L$libXft/lib -I$libXft/include \ configureFlags="-xft -L$libXft/lib -I$libXft/include \
-L$freetype/lib -I$freetype/include \ -L$freetype/lib -I$freetype/include \

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

@@ -1,5 +1,6 @@
{ xftSupport ? true { xftSupport ? true
, xrenderSupport ? true , xrenderSupport ? true
, threadSupport ? true
, stdenv, fetchurl, x11, libXft ? null, libXrender ? null , stdenv, fetchurl, x11, libXft ? null, libXrender ? null
, zlib, libjpeg, libpng, which , zlib, libjpeg, libpng, which
}: }:
@@ -18,6 +19,6 @@ stdenv.mkDerivation {
buildInputs = [x11 libXft libXrender zlib libjpeg libpng which]; buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
inherit xftSupport libXft xrenderSupport libXrender; inherit threadSupport xftSupport libXft xrenderSupport libXrender;
inherit (libXft) freetype fontconfig; inherit (libXft) freetype fontconfig;
} }