diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-20 14:23:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-20 14:23:34 +0000 |
| commit | 8882b48fb0759260eef346a26262659047cba161 (patch) | |
| tree | e7f8aa5e10b780f9dc6ade286034640e89a18458 /pkgs/development | |
| parent | 043ac4d1b0596874a3ea8d34a98fe28667e314b5 (diff) | |
| download | nixlib-8882b48fb0759260eef346a26262659047cba161.tar nixlib-8882b48fb0759260eef346a26262659047cba161.tar.gz nixlib-8882b48fb0759260eef346a26262659047cba161.tar.bz2 nixlib-8882b48fb0759260eef346a26262659047cba161.tar.lz nixlib-8882b48fb0759260eef346a26262659047cba161.tar.xz nixlib-8882b48fb0759260eef346a26262659047cba161.tar.zst nixlib-8882b48fb0759260eef346a26262659047cba161.zip | |
* Optionally enable thread support in Qt (libqt-mt).
svn path=/nixpkgs/trunk/; revision=2072
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/qt-3/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh index cf481bf988c0..a85ac6b942ad 100644 --- a/pkgs/development/libraries/qt-3/builder.sh +++ b/pkgs/development/libraries/qt-3/builder.sh @@ -23,6 +23,12 @@ preConfigure() { configureFlags="-v -prefix $out -system-zlib -system-libpng -system-libjpeg" dontAddPrefix=1 +if test -n "$threadSupport"; then + configureFlags="-thread"; +else + configureFlags="-no-thread"; +fi + if test -n "$xftSupport"; then configureFlags="-xft -L$libXft/lib -I$libXft/include \ -L$freetype/lib -I$freetype/include \ diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 83e9fdfd23b8..d6868746541a 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -1,5 +1,6 @@ { xftSupport ? true , xrenderSupport ? true +, threadSupport ? true , stdenv, fetchurl, x11, libXft ? null, libXrender ? null , zlib, libjpeg, libpng, which }: @@ -18,6 +19,6 @@ stdenv.mkDerivation { buildInputs = [x11 libXft libXrender zlib libjpeg libpng which]; - inherit xftSupport libXft xrenderSupport libXrender; + inherit threadSupport xftSupport libXft xrenderSupport libXrender; inherit (libXft) freetype fontconfig; } |