summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pkgs/applications/graphics/kuickshow/builder.sh6
-rw-r--r--pkgs/applications/graphics/kuickshow/default.nix4
-rw-r--r--pkgs/applications/misc/taskjuggler/default.nix4
-rw-r--r--pkgs/applications/misc/yate/default.nix4
-rw-r--r--pkgs/applications/networking/kphone/default.nix6
-rw-r--r--pkgs/applications/networking/p2p/valknut/default.nix4
-rw-r--r--pkgs/applications/networking/twinkle/default.nix4
-rw-r--r--pkgs/applications/science/misc/vite/default.nix4
-rw-r--r--pkgs/applications/video/mythtv/default.nix6
-rw-r--r--pkgs/desktops/kde-3/kdelibs/default.nix6
-rw-r--r--pkgs/development/libraries/arts/default.nix8
-rw-r--r--pkgs/development/libraries/mlt/default.nix4
-rw-r--r--pkgs/development/libraries/qt-3/default.nix2
-rw-r--r--pkgs/development/tools/documentation/doxygen/default.nix14
-rw-r--r--pkgs/development/tools/misc/xxdiff/3.2.nix4
-rw-r--r--pkgs/misc/drivers/hplip/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix50
17 files changed, 53 insertions, 79 deletions
diff --git a/pkgs/applications/graphics/kuickshow/builder.sh b/pkgs/applications/graphics/kuickshow/builder.sh
index e2e0659ae34..2283e956f7b 100644
--- a/pkgs/applications/graphics/kuickshow/builder.sh
+++ b/pkgs/applications/graphics/kuickshow/builder.sh
@@ -2,11 +2,9 @@ source $stdenv/setup
 
 patchPhase=patchPhase
 patchPhase() {
-  sed -e "s@-ljpeg6b@-ljpeg@" configure > configure.patched
-  mv configure.patched configure
-  chmod u+x configure
+  sed -e "s@-ljpeg6b@-ljpeg@" -i configure
 }
 
 genericBuild
 
-ln -s $KDEDIR/share/mimelnk $out/share
\ No newline at end of file
+ln -sv $KDEDIR/share/mimelnk $out/share
diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix
index fde29735b71..77500d4dc0c 100644
--- a/pkgs/applications/graphics/kuickshow/default.nix
+++ b/pkgs/applications/graphics/kuickshow/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libX11, libXext, libSM, kdelibs, qt, libjpeg, libungif, libpng, libtiff, imlib, arts, expat, perl}:
+{stdenv, fetchurl, libX11, libXext, libSM, kdelibs, qt3, libjpeg, libungif, libpng, libtiff, imlib, arts, expat, perl}:
 
 stdenv.mkDerivation {
   name = "kuickshow-0.8.5";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     --x-includes=${libX11}/include
     --x-libraries=${libX11}/lib";
 
-  buildInputs = [kdelibs libX11 libXext libSM qt libjpeg libungif libpng libtiff imlib arts expat perl];
+  buildInputs = [kdelibs libX11 libXext libSM qt3 libjpeg libungif libpng libtiff imlib arts expat perl];
   inherit libjpeg;
 
   KDEDIR = kdelibs;
diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
index 25cdd1f1646..652450e510b 100644
--- a/pkgs/applications/misc/taskjuggler/default.nix
+++ b/pkgs/applications/misc/taskjuggler/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl,
-zlib, libpng, libjpeg, perl, expat, qt,
+zlib, libpng, libjpeg, perl, expat, qt3,
 libX11, libXext, libSM, libICE,
 withKde, kdelibs, kdebase
 }:
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     --without-arts --disable-docs
     --x-includes=${libX11}/include
     --x-libraries=${libX11}/lib
-    --with-qt-dir=${qt}
+    --with-qt-dir=${qt3}
     --with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"}
   ";
 
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 2994ca19065..b2f4217afb5 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,4 +1,4 @@
-{ composableDerivation, fetchurl, lib, qt, openssl, autoconf, automake, pkgconfig }:
+{ composableDerivation, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
 
 let inherit (composableDerivation) edf wwf; in
 
@@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} ( fixed : {
   };
 
   # TODO zaptel ? postgres ?
-  buildInputs = [ qt openssl autoconf automake pkgconfig ];
+  buildInputs = [ qt4 openssl autoconf automake pkgconfig ];
 
   # /dev/null is used when linking which is a impure path for the wrapper
   preConfigure =
diff --git a/pkgs/applications/networking/kphone/default.nix b/pkgs/applications/networking/kphone/default.nix
index 7b1c7c76dd8..dceb24a48b8 100644
--- a/pkgs/applications/networking/kphone/default.nix
+++ b/pkgs/applications/networking/kphone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, qt, pkgconfig
+{ stdenv, fetchurl, autoconf, automake, libtool, qt3, pkgconfig
 , openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
 , libSM }:
 
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
   name = "kphone-1.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/kphone/files/KPhone%20SI/KPhoneSIv1.2/kphoneSI_1.2.tar.gz;
+    url = mirror://sourceforge/kphone/kphoneSI_1.2.tar.gz;
     sha256 = "1q309n2gsdsa8d7ff2zwnyc69ngpnnj143dys90dnlmzr9ckhhg3";
   };
 
   buildInputs =
-    [ autoconf automake libtool qt pkgconfig openssl libpng alsaLib
+    [ autoconf automake libtool qt3 pkgconfig openssl libpng alsaLib
       libX11 libXext libXt libICE libSM
     ];
     
diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix
index 994f6b44f94..2290cf52314 100644
--- a/pkgs/applications/networking/p2p/valknut/default.nix
+++ b/pkgs/applications/networking/p2p/valknut/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt, dclib}:
+{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt3, dclib}:
 
 stdenv.mkDerivation {
   name = "valknut-0.3.7";
@@ -9,6 +9,6 @@ stdenv.mkDerivation {
     md5 = "848f9b3f25af15c3f1837133ac4b9415";
   };
 
-  buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt dclib];
+  buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt3 dclib];
   inherit openssl;
 }
diff --git a/pkgs/applications/networking/twinkle/default.nix b/pkgs/applications/networking/twinkle/default.nix
index 905f7efc43a..0824210c4b5 100644
--- a/pkgs/applications/networking/twinkle/default.nix
+++ b/pkgs/applications/networking/twinkle/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost
-, libsndfile, libxml2, libjpeg, readline, qt, perl, file
+, libsndfile, libxml2, libjpeg, readline, qt3, perl, file
 , alsaLib, speex, libzrtpcpp, xorg }:
         
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ pkgconfig commoncpp2 ccrtp openssl boost libsndfile
-      libxml2 libjpeg readline qt perl file
+      libxml2 libjpeg readline qt3 perl file
       # optional ? :
       alsaLib
       speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 24060c277fd..4c1cf318b5a 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -1,4 +1,4 @@
-{ fetchsvn, stdenv, cmake, qt, mesa }:
+{ fetchsvn, stdenv, cmake, qt4, mesa }:
 
 # ViTE 1.1 has several bugs, so use the SVN version.
 let
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   patches = [ ./larger-line-buffer.patch ];
 
-  buildInputs = [ cmake qt mesa ];
+  buildInputs = [ cmake qt4 mesa ];
 
   NIX_LDFLAGS = "-lGLU";
 
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 6ca6651c571..821c37d9c51 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchurl, which, qt3, x11, xlibs
+a@{ stdenv, fetchurl, which, qt3, x11, xlibs
 , lame, zlib, mesa, alsaLib
 , freetype, perl
 }:
 
-assert qt3.mysqlSupport;
+let
+  qt3 = a.qt3.override { mysqlSupport = true; };
+in
 
 stdenv.mkDerivation {
   name = "mythtv-0.21";
diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix
index 69c6c5c332e..0f3494c0581 100644
--- a/pkgs/desktops/kde-3/kdelibs/default.nix
+++ b/pkgs/desktops/kde-3/kdelibs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibs, zlib, perl, qt, openssl, pcre
+{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
 , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
 , freetype, bzip2, cups, attr, acl
 }:
@@ -22,10 +22,10 @@ stdenv.mkDerivation {
     ./kdelibs-3.5.10-openssl_1.0.0.patch
   ];
 
-  passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
+  passthru = {inherit openssl libjpeg qt3; inherit (xlibs) libX11;};
   
   buildInputs = [
-    zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2
+    zlib perl qt3 openssl pcre pkgconfig libjpeg libpng libtiff libxml2
     libxslt expat libtool freetype bzip2 cups
     xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
   ];
diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix
index d895724f691..50c270f534e 100644
--- a/pkgs/development/libraries/arts/default.nix
+++ b/pkgs/development/libraries/arts/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg, libpng, perl, qt}:
+{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg
+, libpng, perl, qt3}:
 
 stdenv.mkDerivation {
   name = "arts-1.5.10";
@@ -19,7 +20,10 @@ stdenv.mkDerivation {
     --enable-final
   '';
 
-  buildInputs = [pkgconfig glib kdelibs libX11 libXext zlib libjpeg libpng perl qt];
+  buildNativeInputs = [ pkgconfig perl ];
+
+  buildInputs =
+    [glib kdelibs libX11 libXext zlib libjpeg libpng qt3];
 
   meta = {
     homepage = http://www.arts-project.org/;
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 13f0a69950c..384c31a7cd4 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, SDL, qt, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
+{stdenv, fetchurl, SDL, qt4, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
 libvorbis, sox}:
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1xcrrd3xbz9hmahgl7xf610cm97chwpxwgcajkd10mpcxbqs08i0";
   };
 
-  buildInputs = [ qt SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
+  buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
 
   # Mostly taken from:
   # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 64b984c3f3a..e023235b936 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -5,7 +5,7 @@
 , xineramaSupport ? true, libXinerama ? null
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
-, mysqlSupport ? true, mysql ? null
+, mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
 , x11, xextproto, zlib, libjpeg, libpng, which
 }:
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index df51c51bde1..86f2e8cf2b2 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, flex, bison, qt }:
+{ stdenv, fetchurl, perl, flex, bison, qt4 }:
 
 let
   name = "doxygen-1.7.4";
@@ -15,18 +15,18 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ perl flex bison ]
-    ++ stdenv.lib.optional (qt != null) qt;
+    ++ stdenv.lib.optional (qt4 != null) qt4;
 
   prefixKey = "--prefix ";
 
   configureFlags =
     [ "--dot dot" ]
-    ++ stdenv.lib.optional (qt != null) "--with-doxywizard";
+    ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
 
-  preConfigure = stdenv.lib.optionalString (qt != null)
+  preConfigure = stdenv.lib.optionalString (qt4 != null)
     ''
-      echo "using QTDIR=${qt}..."
-      export QTDIR=${qt}
+      echo "using QTDIR=${qt4}..."
+      export QTDIR=${qt4}
     '';
 
   makeFlags = "MAN1DIR=share/man/man1";
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
     '';
 
     maintainers = [stdenv.lib.maintainers.simons];
-    platforms = if (qt != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
+    platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/xxdiff/3.2.nix b/pkgs/development/tools/misc/xxdiff/3.2.nix
index ddaa8e6849b..e637eeb04de 100644
--- a/pkgs/development/tools/misc/xxdiff/3.2.nix
+++ b/pkgs/development/tools/misc/xxdiff/3.2.nix
@@ -5,7 +5,7 @@ rec {
     sha256 = "1f5j9l9n5j2ab0h3iwaz0mnz0y8h7ilc0dbcrfmaibk2njx38mcn";
   };
 
-  buildInputs = [qt flex bison python pkgconfig makeWrapper 
+  buildInputs = [qt3 flex bison python pkgconfig makeWrapper 
     libX11 libXext];
   configureFlags = [];
 
@@ -20,7 +20,7 @@ rec {
 
   prepareMainBuild = fullDepEntry (''
     cd src 
-    export QTDIR=${qt}/
+    export QTDIR=${qt3}/
     make -f Makefile.bootstrap makefile
   '') ["minInit" "doUnpack"];
 
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index e73e6ff05fe..514655bd727 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus
-, pkgconfig, polkit, qtSupport ? false, qt4
+, pkgconfig, polkit, qtSupport ? true, qt4
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8aee10069c4..8018c86a1f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2901,13 +2901,9 @@ let
     inherit python pil makeWrapper;
   };
 
-  doxygen = lowPrio (callPackage ../development/tools/documentation/doxygen {
-    qt = null;
-  });
+  doxygen = lowPrio (doxygen_gui.override { qt4 = null; });
 
-  doxygen_gui = doxygen.override {
-    qt = qt4;
-  };
+  doxygen_gui = callPackage ../development/tools/documentation/doxygen { };
 
   eggdbus = callPackage ../development/tools/misc/eggdbus { };
 
@@ -3096,8 +3092,7 @@ let
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
   xxdiff = builderDefsPackage (import ../development/tools/misc/xxdiff/3.2.nix) {
-    qt = qt3;
-    inherit pkgconfig makeWrapper bison python flex;
+    inherit pkgconfig makeWrapper bison python flex qt3;
     inherit (xlibs) libXext libX11;
   };
 
@@ -4260,9 +4255,7 @@ let
 
   mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
 
-  mlt = callPackage ../development/libraries/mlt {
-    qt = qt4;
-  };
+  mlt = callPackage ../development/libraries/mlt { };
 
   libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
 
@@ -4451,11 +4444,6 @@ let
 
   qt3 = callPackage ../development/libraries/qt-3 {
     openglSupport = mesaSupported;
-    mysqlSupport = getConfig ["qt" "mysql"] false;
-  };
-
-  qt3mysql = qt3.override {
-    mysqlSupport = true;
   };
 
   qt4 = pkgs.kde4.qt4;
@@ -7161,9 +7149,7 @@ let
   mupdf = callPackage ../applications/misc/mupdf {
   };
 
-  mythtv = callPackage ../applications/video/mythtv {
-    qt3 = qt3mysql;
-  };
+  mythtv = callPackage ../applications/video/mythtv { };
 
   nano = callPackage ../applications/editors/nano { };
 
@@ -7446,8 +7432,6 @@ let
   teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
 
   taskjuggler = callPackage ../applications/misc/taskjuggler {
-    qt = qt3;
-
     # KDE support is not working yet.
     inherit (kde3) kdelibs kdebase;
     withKde = getConfig [ "taskJuggler" "kde" ] false;
@@ -7486,7 +7470,6 @@ let
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
   twinkle = callPackage ../applications/networking/twinkle {
-    qt = qt3;
     boost = boostFull;
     ccrtp = ccrtp_1_8;
     libzrtpcpp = libzrtpcpp_1_6;
@@ -7508,9 +7491,7 @@ let
     inherit (gnome) glib_networking libsoup;
   };
 
-  valknut = callPackage ../applications/networking/p2p/valknut {
-    qt = qt3;
-  };
+  valknut = callPackage ../applications/networking/p2p/valknut { };
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
@@ -7712,9 +7693,7 @@ let
     inherit (gnome) scrollkeeper libglade;
   };
 
-  yate = callPackage ../applications/misc/yate {
-    qt = qt4;
-  };
+  yate = callPackage ../applications/misc/yate { };
 
   qgis = callPackage ../applications/misc/qgis {};
 
@@ -8021,13 +8000,10 @@ let
 
     kdelibs = callPackage ../desktops/kde-3/kdelibs {
       stdenv = overrideGCC stdenv gcc43;
-      qt = qt3;
     };
 
     arts = callPackage ../development/libraries/arts {
-      qt = qt3;
-      inherit (gnome) glib;
-      inherit (kde3) kdelibs;
+      inherit (pkgs.kde3) kdelibs;
     };
 
     k3b = callPackage ../applications/misc/k3b/1.0.nix {
@@ -8040,13 +8016,11 @@ let
     };
 
     kphone = callPackage ../applications/networking/kphone {
-      qt = qt3;
       stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
     };
 
     kuickshow = callPackage ../applications/graphics/kuickshow {
       inherit (kde3) arts kdelibs;
-      qt = qt3;
     };
 
   };
@@ -8364,9 +8338,7 @@ let
 
   tulip = callPackage ../applications/science/misc/tulip { };
 
-  vite = callPackage ../applications/science/misc/vite {
-    qt = qt4;
-  };
+  vite = callPackage ../applications/science/misc/vite { };
 
   ### MISC
 
@@ -8443,9 +8415,7 @@ let
 
   gxemul = callPackage ../misc/gxemul { };
 
-  hplip = callPackage ../misc/drivers/hplip {
-    qtSupport = true;
-  };
+  hplip = callPackage ../misc/drivers/hplip { };
 
   # using the new configuration style proposal which is unstable
   jack1d = callPackage ../misc/jackaudio/jack1.nix { };
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-14 08:17:03 +0000