From a60cdda3c6b64aa2edf1d99e744428cabdc3905b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Apr 2010 17:29:36 +0000
Subject: [PATCH] Remove qt-4.4

svn path=/nixpkgs/trunk/; revision=21012
---
 pkgs/development/libraries/qt-4.4/default.nix | 70 -------------------
 .../libraries/qt-4.4/setup-hook.sh            |  9 ---
 pkgs/top-level/all-packages.nix               | 14 ----
 3 files changed, 93 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-4.4/default.nix
 delete mode 100644 pkgs/development/libraries/qt-4.4/setup-hook.sh

diff --git a/pkgs/development/libraries/qt-4.4/default.nix b/pkgs/development/libraries/qt-4.4/default.nix
deleted file mode 100644
index a378a9dd94b..00000000000
--- a/pkgs/development/libraries/qt-4.4/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "qt-4.4.3";
-  
-  src = fetchurl {
-    url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.3.tar.bz2;
-    sha256 = "1nfdf1aj6vb7qyacsnjyjxrnaf44hz7vzykf6zra2znd87pglz51";
-  };
-  
-  setupHook = ./setup-hook.sh;
-  
-  propagatedBuildInputs = [
-    libXft 
-    libXrender 
-    libXrandr 
-    randrproto 
-    xextproto
-    libXinerama 
-    xineramaproto 
-    libXcursor 
-    zlib 
-    libjpeg 
-    mysql 
-    libpng 
-    which 
-    mesa
-    libXmu 
-    openssl 
-    dbus.libs 
-    cups 
-    pkgconfig 
-    libXext 
-    freetype 
-    fontconfig 
-    inputproto
-    fixesproto 
-    libXfixes 
-    glib 
-    libtiff
-  ];
-  
-  prefixKey = "-prefix ";
-  
-  configureFlags = ''
-    -v -no-separate-debug-info -release
-    -system-zlib -system-libpng -system-libjpeg -fast
-    -qt-gif -confirm-license
-    -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-    -qdbus -cups -glib -xfixes -dbus-linked
-    -fontconfig -I${freetype}/include/freetype2
-  '';
-
-  patchPhase = ''
-    substituteInPlace configure --replace /bin/pwd pwd
-    sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
-  '';
-
-  # Remove the documentation: it takes up >= 130 MB, which is more
-  # than half of the installed size.  Ideally we should put this in a
-  # separate package (as well as the Qt Designer).
-  postInstall = ''
-    rm -rf $out/doc
-  '';
-
-  meta = {
-    homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
-    description = "A cross-platform application framework for C++";
-  };
-}
diff --git a/pkgs/development/libraries/qt-4.4/setup-hook.sh b/pkgs/development/libraries/qt-4.4/setup-hook.sh
deleted file mode 100644
index f9ecacbbb7d..00000000000
--- a/pkgs/development/libraries/qt-4.4/setup-hook.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-export QTDIR=@out@
-
-if [ -n "$includeAllQtDirs" ]; then
-  # This helps for g++, but not for moc. And no qt4 package should expect
-  # having all qt4 header files dirs into -I.
-  for d in @out@/include/*; do
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"
-  done
-fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 495ba477a33..ebacbee4599 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4818,11 +4818,6 @@ let
     qt4Support = false;
   };
 
-  popplerQt44 = poppler.override {
-    qt4Support = true;
-    qt4 = qt44;
-  };
-
   popplerQt45 = poppler.override {
     qt4Support = true;
     qt4 = qt45;
@@ -4859,15 +4854,6 @@ let
 
   qt4 = qt46;
 
-  qt44 = import ../development/libraries/qt-4.4 {
-    inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
-      fontconfig freetype pkgconfig libtiff;
-    inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
-      libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
-      inputproto fixesproto libXfixes;
-    inherit (gnome) glib;
-  };
-
   qt45 = import ../development/libraries/qt-4.5 {
     inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
       fontconfig freetype pkgconfig libtiff;