Added CUPS administration tools in kdeadmin

svn path=/nixpkgs/trunk/; revision=14457

8 files changed, 69 insertions, 21 deletions

diff --git a/pkgs/desktops/kde-4.2/admin/builder.sh b/pkgs/desktops/kde-4.2/admin/builder.sh
new file mode 100644
index 00000000000..09cb930f049
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/admin/builder.sh
@@ -0,0 +1,13 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py
+    do
+	sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i
+    done
+    
+    sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix
index cddaa97f528..a741525b071 100644
--- a/pkgs/desktops/kde-4.2/admin/default.nix
+++ b/pkgs/desktops/kde-4.2/admin/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, cmake, qt4, pkgconfig, perl, kdelibs, kdepimlibs, automoc4, phonon}:
+{stdenv, fetchurl, cmake, qt4, pkgconfig, perl, python,
+ sip, pyqt4, pycups, system_config_printer, rhpl,
+ kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
 
 stdenv.mkDerivation {
   name = "kdeadmin-4.2.1";
@@ -6,6 +8,9 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.1/src/kdeadmin-4.2.1.tar.bz2;
     sha1 = "888203103fe86010461b1e38d51ba9a20f3250e8";
   };
+  builder = ./builder.sh;
+  inherit system_config_printer;
   CMAKE_PREFIX_PATH=kdepimlibs;
-  buildInputs = [ cmake qt4 pkgconfig perl kdelibs kdepimlibs automoc4 phonon ];
+  buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl
+                  kdelibs kdepimlibs kdebindings automoc4 phonon ];
 }
diff --git a/pkgs/desktops/kde-4.2/bindings/builder.sh b/pkgs/desktops/kde-4.2/bindings/builder.sh
index 73684b4aad8..e3f1df28b77 100644
--- a/pkgs/desktops/kde-4.2/bindings/builder.sh
+++ b/pkgs/desktops/kde-4.2/bindings/builder.sh
@@ -1,11 +1,11 @@
 source $stdenv/setup
 
-myPatchPhase()
-{
-    # Fix python site packages directory
-    sed -i -e "s@\${PYTHON_SITE_PACKAGES_DIR}@\${CMAKE_INSTALL_PREFIX}/lib/python2.5@g" \
-           -e "s@\${SIP_DEFAULT_SIP_DIR}@\${CMAKE_INSTALL_PREFIX}/share/sip@g" \
-	   python/pykde4/CMakeLists.txt
-}
-patchPhase=myPatchPhase
-genericBuild
+tar xfvj $src
+cd kdebindings-*/python/pykde4
+python configure.py -d $out/lib/python2.5/site-packages -v $out/share/sip
+for i in `find . -name Makefile`
+do
+    sed -i -e "s/-O2/-O0/" $i
+done
+make
+make install
diff --git a/pkgs/desktops/kde-4.2/bindings/default.nix b/pkgs/desktops/kde-4.2/bindings/default.nix
index 0109a6c5ce1..712f321bef2 100644
--- a/pkgs/desktops/kde-4.2/bindings/default.nix
+++ b/pkgs/desktops/kde-4.2/bindings/default.nix
@@ -1,5 +1,8 @@
-{stdenv, fetchurl, cmake, qt4, perl, python, sip, pyqt4,
- kdelibs, kdepimlibs, automoc4, phonon}:
+{stdenv, fetchurl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4,
+ libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}:
+
+# This function will only build the pykde4 module. I don't need the other bindings and
+# some bindings are even broken.
 
 stdenv.mkDerivation {
   name = "kdebindings-4.2.1";
@@ -8,7 +11,6 @@ stdenv.mkDerivation {
     sha1 = "96353bb3269a7ca37ff31487a0fb7a9c25958963";
   };
   builder = ./builder.sh;
-  CMAKE_PREFIX_PATH=kdepimlibs;
-  buildInputs = [ cmake qt4 perl python sip pyqt4
-                  kdelibs kdepimlibs automoc4 phonon ];
+  buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4
+                  libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ];
 }
diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index afab963f580..1ee4a0e9009 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -83,8 +83,8 @@ rec {
   };
   
   kdeadmin = import ./admin {
-    inherit (pkgs) stdenv fetchurl cmake qt4 pkgconfig perl;
-    inherit kdelibs kdepimlibs;
+    inherit (pkgs) stdenv fetchurl cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl;
+    inherit kdelibs kdepimlibs kdebindings;
     inherit automoc4 phonon;
   };
   
@@ -160,9 +160,9 @@ rec {
 ### DEVELOPMENT
 
   kdebindings = import ./bindings {
-    inherit (pkgs) stdenv fetchurl cmake qt4 perl python sip pyqt4;
-    inherit kdelibs kdepimlibs;
-    inherit automoc4 phonon;
+    inherit (pkgs) stdenv fetchurl python sip zlib libpng pyqt4 freetype fontconfig qt4;
+    inherit (pkgs.xlibs) libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext;
+    inherit kdelibs;
   };
   
   kdesdk = import ./sdk {
diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh
new file mode 100644
index 00000000000..d458500b4ef
--- /dev/null
+++ b/pkgs/development/python-modules/rhpl/builder.sh
@@ -0,0 +1,12 @@
+source $stdenv/setup
+
+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/bin/install@install@g" \
+       -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile       
+make PREFIX=$out
+make PREFIX=$out install
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
new file mode 100644
index 00000000000..a577d3ac7b9
--- /dev/null
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, rpm, cpio, python, wirelesstools, gettext}:
+
+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 ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a8506a0678..b8d14e42f20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6229,6 +6229,10 @@ let
     inherit python;
   };
 
+  rhpl = import ../development/python-modules/rhpl {
+    inherit stdenv fetchurl rpm cpio python wirelesstools gettext;
+  };
+  
   sip = import ../development/python-modules/python-sip {
     inherit stdenv fetchurl python;
   };