From 61980ddf12ac52fd70cea2a7ebca0d8f3e2d9163 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 15 Feb 2010 21:53:31 +0000
Subject: [PATCH] Fixed rhpl which also fixes printer support in kdeadmin

svn path=/nixpkgs/trunk/; revision=20031
---
 pkgs/desktops/kde-4.4/admin/default.nix         | 6 +++---
 pkgs/desktops/kde-4.4/default.nix               | 2 +-
 pkgs/development/python-modules/rhpl/builder.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-4.4/admin/default.nix b/pkgs/desktops/kde-4.4/admin/default.nix
index e60106a7112..a66bf01ce77 100644
--- a/pkgs/desktops/kde-4.4/admin/default.nix
+++ b/pkgs/desktops/kde-4.4/admin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python
-, sip, pyqt4, pycups, system_config_printer
+, sip, pyqt4, pycups, rhpl, system_config_printer
 , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
 
 stdenv.mkDerivation {
@@ -14,9 +14,9 @@ stdenv.mkDerivation {
   
   inherit system_config_printer;
   
+  PYTHONPATH = "${pycups}/lib/python2.6/site-packages";
   
-  
-  buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer
+  buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
                   kdelibs kdepimlibs kdebindings automoc4 phonon ];
                   
   meta = {
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 616a15aeb06..5748581a194 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/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;
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer;
     inherit kdelibs kdepimlibs kdebindings;
     inherit automoc4 phonon;
   };
diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh
index d458500b4ef..5c56b70c24f 100644
--- a/pkgs/development/python-modules/rhpl/builder.sh
+++ b/pkgs/development/python-modules/rhpl/builder.sh
@@ -4,8 +4,8 @@ rpm2cpio $src | cpio -idv
 tar xfvj rhpl-*.tar.bz2
 rm rhpl-*.tar.bz2
 cd rhpl-*
-sed -i -e "s@/usr/include/\$(PYTHON)@$python/include/python2.5@" \
-       -e "s@PYTHONLIBDIR = /usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $out/lib/python2.5/site-packages@" Makefile.inc
+sed -i -e "s@/usr/include/\$(PYTHON)@$python/include/python2.6@" \
+       -e "s@PYTHONLIBDIR = /usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $out/lib/python2.6/site-packages@" Makefile.inc
 sed -i -e "s@/usr/bin/install@install@g" \
        -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile       
 make PREFIX=$out