diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-22 00:19:27 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-22 00:19:27 +0000 |
commit | ba6f269bf550a35811be8e74a9eb253ee0d79105 (patch) | |
tree | c80ec51e997db147ed706acd3738af144f08717e /pkgs/development/libraries/qt-3 | |
parent | f1ae49c01b7ee68a987b42a6198c05595a2aeda1 (diff) |
* Qt: add optional support for MySQL.
* MythTV: the setup program works :-). * Added XmlTV. This requires a huge number of Perl modules, so... * Added a generic builder for Perl modules. I'm lazy so the modules are defined directly in all-packages-generic.nix. The generic builder also patches Perl scripts to include a hard-coded Perl module search path (i.e., similar to an RPATH in ELF executables). svn path=/nixpkgs/trunk/; revision=2083
Diffstat (limited to 'pkgs/development/libraries/qt-3')
-rw-r--r-- | pkgs/development/libraries/qt-3/builder.sh | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh index 0f45c1acce4e7..5273ca795d3dd 100644 --- a/pkgs/development/libraries/qt-3/builder.sh +++ b/pkgs/development/libraries/qt-3/builder.sh @@ -7,15 +7,14 @@ preConfigure() { # Patch some of the configure files a bit to get of global paths. # (Buildings using stuff in those paths will fail anyway, but it # will cause ./configure misdetections). - for i in config.tests/*/*.test mkspecs/*/qmake.conf; do + for i in config.tests/unix/checkavail config.tests/*/*.test mkspecs/*/qmake.conf; do echo "patching $i..." sed < $i > $i.tmp \ -e 's^ /lib^ /FOO^g' \ -e 's^/usr^/FOO^g' + if test -x $i; then chmod +x $i.tmp; fi mv $i.tmp $i done - - chmod +x config.tests/*/*.test } @@ -36,6 +35,12 @@ if test -n "$xftSupport"; then $configureFlags" fi +if test -n "$mysqlSupport"; then + configureFlags="-qt-sql-mysql -L$mysql/lib/mysql -I$mysql/include/mysql $configureFlags"; +else + configureFlags="-no-thread $configureFlags"; +fi + if test -n "$xrenderSupport"; then configureFlags="-xrender -L$libXrender/lib -I$libXrender/include $configureFlags" fi diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index d6868746541ac..7f29396cf6149 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -1,12 +1,14 @@ { xftSupport ? true , xrenderSupport ? true , threadSupport ? true -, stdenv, fetchurl, x11, libXft ? null, libXrender ? null +, mysqlSupport ? true +, stdenv, fetchurl, x11, libXft ? null, libXrender ? null, mysql ? null , zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; assert xrenderSupport -> xftSupport && libXft != null; +assert mysqlSupport -> mysql != null; stdenv.mkDerivation { name = "qt-3.3.3"; @@ -20,5 +22,6 @@ stdenv.mkDerivation { buildInputs = [x11 libXft libXrender zlib libjpeg libpng which]; inherit threadSupport xftSupport libXft xrenderSupport libXrender; + inherit mysqlSupport mysql; inherit (libXft) freetype fontconfig; } |