Added pycups,desktop_file_utils,system_config_printer packages and added python kdebindings closure

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

pkgs/desktops/kde-4.2/bindings/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, cmake, qt4, perl, python, sip, pyqt4,
+ kdelibs, kdepimlibs, automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "kdebindings-4.2.0";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.0/src/kdebindings-4.2.0.tar.bz2;
+    md5 = "6eae8fd968da83fe65e592993e416adc";
+  };
+  CMAKE_PREFIX_PATH=kdepimlibs;
+  buildInputs = [ cmake qt4 perl python sip pyqt4
+                  kdelibs kdepimlibs automoc4 phonon ];
+}

pkgs/desktops/kde-4.2/default.nix

@@ -159,6 +159,12 @@ rec {
   
 ### DEVELOPMENT
 
+  kdebindings = import ./bindings {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl python sip pyqt4;
+    inherit kdelibs kdepimlibs;
+    inherit automoc4 phonon;
+  };
+  
   kdesdk = import ./sdk {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost subversion;
     inherit kdelibs kdepimlibs;

pkgs/development/python-modules/pycups/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, python, cups}:
+
+stdenv.mkDerivation {
+  name = "pycups-1.9.45";
+  src = fetchurl {
+    url = http://cyberelk.net/tim/data/pycups/pycups-1.9.45.tar.bz2;
+    md5 = "ff634a6751f8a859ed26751bf03abef0";
+  };
+  installPhase = "python ./setup.py install --prefix $out";
+  buildInputs = [ python cups ];
+}

pkgs/development/python-modules/pyqt/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, python, sip, qt4}:
+
+stdenv.mkDerivation {
+  name = "pyqt-x11-gpl-4.4.4";
+  src = fetchurl {
+    url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.4.4.tar.gz;
+    md5 = "4bd346d56d10452e47ac71e2cbe04229";
+  };
+  configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/python2.5/site-packages -v $out/share/sip -p $out/plugins";
+  buildInputs = [ python sip qt4 ];
+}

pkgs/development/python-modules/python-sip/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, python}:
+
+stdenv.mkDerivation {
+  name = "sip-4.7.9";
+  src = fetchurl {
+    url = http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.7.9.tar.gz;
+    md5 = "597d7ff7edb42a18421c806ffd18a136";
+  };
+  configurePhase = "python ./configure.py -d $out/lib/python2.5/site-packages -b $out/bin -e $out/include";
+  buildInputs = [ python ];
+}

pkgs/tools/misc/desktop-file-utils/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, glib}:
+
+stdenv.mkDerivation {
+  name = "desktop-file-utils-0.15";
+  src = fetchurl {
+    url = http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.15.tar.gz;
+    md5 = "2fe8ebe222fc33cd4a959415495b7eed";
+  };
+  buildInputs = [ pkgconfig glib ];
+}

pkgs/tools/misc/system-config-printer/default.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, perl, perlXMLParser, autoconf, automake, intltool, gettext, desktop_file_utils}:
+
+stdenv.mkDerivation {
+  name = "system-config-printer-0.9.93";
+  src = fetchurl {
+    url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2;
+    md5 = "b97deae648bc1c5825874d250a9c140c";
+  };
+  patchPhase = ''
+    sed -i -e "s/xmlto/echo xmlto/" Makefile.am # Disable building manual pages
+    echo > man/system-config-printer.1
+    echo > man/system-config-printer-applet.1
+    ./bootstrap
+  ''; 
+  buildInputs = [ perl perlXMLParser autoconf automake intltool gettext desktop_file_utils ];
+}

pkgs/top-level/all-packages.nix

@@ -568,6 +568,11 @@ let
 
   ddrescue = builderDefsPackage (selectVersion ../tools/system/ddrescue "1.8") {};
 
+  desktop_file_utils = import ../tools/misc/desktop-file-utils {
+    inherit stdenv fetchurl pkgconfig;
+    inherit (gtkLibs) glib;
+  };
+  
   dev86 = import ../development/compilers/dev86 {
     inherit fetchurl stdenv;
   };
@@ -1196,6 +1201,10 @@ let
     inherit fetchurl stdenv pam;
   };
 
+  system_config_printer = import ../tools/misc/system-config-printer {
+    inherit stdenv fetchurl perl perlXMLParser autoconf automake intltool gettext desktop_file_utils;
+  };
+  
   tcpdump = import ../tools/networking/tcpdump {
     inherit fetchurl stdenv libpcap;
   };
@@ -6156,6 +6165,10 @@ let
     inherit fetchurl stdenv python gmp;
   };
 
+  pycups = import ../development/python-modules/pycups {
+    inherit stdenv fetchurl python cups;
+  };
+  
   pygame = import ../development/python-modules/pygame {
     inherit fetchurl stdenv python pkgconfig SDL SDL_image
       SDL_mixer SDL_ttf numeric;
@@ -6183,6 +6196,10 @@ let
     inherit python;
   };
 
+  sip = import ../development/python-modules/python-sip {
+    inherit stdenv fetchurl python;
+  };
+
   pyqt = builderDefsPackage (selectVersion ../development/python-modules/pyqt "4.3.3") {
     inherit pkgconfig python pythonSip;
     inherit (xlibs) libX11 libXext;
@@ -6190,6 +6207,10 @@ let
     qt = qt4;
   };
 
+  pyqt4 = import ../development/python-modules/pyqt {
+    inherit stdenv fetchurl python sip qt4;
+  };
+  
   pyx = import ../development/python-modules/pyx {
     inherit fetchurl stdenv python makeWrapper;
   };