From 3687f56e7ac75e4f527802d88cc64bbba47acd61 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Feb 2010 12:56:57 +0000
Subject: [PATCH] * Drop the rhpl dependency in kdeadmin and kdeutils because
 it doesn't   build.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19779
---
 pkgs/desktops/kde-4.3/admin/default.nix          | 11 +++++++++--
 pkgs/desktops/kde-4.3/default.nix                |  4 ++--
 pkgs/desktops/kde-4.3/utils/default.nix          | 11 +++++++++--
 pkgs/development/python-modules/rhpl/default.nix |  4 ++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-4.3/admin/default.nix b/pkgs/desktops/kde-4.3/admin/default.nix
index 71282a23721..5dd8d30bb21 100644
--- a/pkgs/desktops/kde-4.3/admin/default.nix
+++ b/pkgs/desktops/kde-4.3/admin/default.nix
@@ -1,19 +1,26 @@
 { stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python
-, sip, pyqt4, pycups, system_config_printer, rhpl
+, sip, pyqt4, pycups, system_config_printer
 , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
 
 stdenv.mkDerivation {
   name = "kdeadmin-4.3.4";
+  
   src = fetchurl {
     url = mirror://kde/stable/4.3.4/src/kdeadmin-4.3.4.tar.bz2;
     sha1 = "8f61aeb2ff9d51712d72cd77dad837c8902b6a5d";
   };
+  
   builder = ./builder.sh;
+  
   inherit system_config_printer;
+  
   includeAllQtDirs=true;
+  
   CMAKE_PREFIX_PATH=kdepimlibs;
-  buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl
+  
+  buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer
                   kdelibs kdepimlibs kdebindings automoc4 phonon ];
+                  
   meta = {
     description = "KDE Administration Utilities";
     license = "GPL";
diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index 48ba9fc65a3..9fa61fa4881 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -102,7 +102,7 @@ pkgs.recurseIntoAttrs (rec {
   };
   
   kdeadmin = import ./admin {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer;
     inherit kdelibs kdepimlibs kdebindings;
     inherit automoc4 phonon;
   };
@@ -185,7 +185,7 @@ pkgs.recurseIntoAttrs (rec {
   };
     
   kdeutils = import ./utils {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer rhpl;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer;
     inherit kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings;
     inherit automoc4 phonon qimageblitz qca2;
   };
diff --git a/pkgs/desktops/kde-4.3/utils/default.nix b/pkgs/desktops/kde-4.3/utils/default.nix
index 005a3e3cdba..ced47d57b4a 100644
--- a/pkgs/desktops/kde-4.3/utils/default.nix
+++ b/pkgs/desktops/kde-4.3/utils/default.nix
@@ -1,19 +1,26 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
-, sip, pyqt4, pycups, system_config_printer, rhpl
+, sip, pyqt4, pycups, system_config_printer
 , kdelibs, kdelibs_experimental, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}:
 
 stdenv.mkDerivation {
   name = "kdeutils-4.3.4";
+  
   src = fetchurl {
     url = mirror://kde/stable/4.3.4/src/kdeutils-4.3.4.tar.bz2;
     sha1 = "2d5e26055e364af2df7459cdbc3aebdc3a8abdea";
   };
+  
   builder = ./builder.sh;
+  
   inherit system_config_printer;
+  
   includeAllQtDirs=true;
+  
   CMAKE_PREFIX_PATH=kdepimlibs;
-  buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer rhpl
+  
+  buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer
                   kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ];
+                  
   meta = {
     description = "KDE Utilities";
     license = "GPL";
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index a577d3ac7b9..7b33932492b 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -2,11 +2,15 @@
 
 stdenv.mkDerivation {
   name = "rhpl-0.218";
+  
   src = fetchurl {
     url = http://ftp.stw-bonn.de/pub/fedora/linux/releases/10/Everything/source/SRPMS/rhpl-0.218-1.src.rpm;
     md5 = "a72c6b66df782ca1d4950959d2aad292";
   };
+  
   inherit python;
+  
   builder = ./builder.sh;
+  
   buildInputs = [ rpm cpio python wirelesstools gettext ];
 }