From ce544df56120c33ad92100a15de24c3bb0662bac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Feb 2012 01:30:22 +0000
Subject: [PATCH] * Revert r31596 (which changes the Qt for KDE 4.7).  This
 doesn't   belong in the stdenv branch and breaks KDE  
 (http://hydra.nixos.org/build/2068311).

svn path=/nixpkgs/branches/stdenv-updates/; revision=32381
---
 pkgs/desktops/kde-4.7/default.nix       | 4 ++--
 pkgs/desktops/kde-4.7/kde-workspace.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 6abcc02139d..3bdf825410c 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, callPackageOrig, stdenv, qt48 }:
+{ callPackage, callPackageOrig, stdenv, qt47 }:
 
 let
   release = "4.7.4";
@@ -44,7 +44,7 @@ kde.modules // kde.individual //
 
   akonadi = callPackage ./support/akonadi { };
 
-  qt4 = qt48;
+  qt4 = qt47;
 
   kdebase_workspace = kde.modules.kde_workspace;
 
diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix
index 55c243f60dd..277bdd62634 100644
--- a/pkgs/desktops/kde-4.7/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.7/kde-workspace.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
-  lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
-  consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
-  pykde4
+{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies
+, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate
+, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
+, pykde4
 }:
 
 kde {