diff options
author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-03-09 13:29:37 +0000 |
---|---|---|
committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-03-09 13:29:37 +0000 |
commit | 2c11f47c8cb620fc5b38ddd1dfa748e24cf2921a (patch) | |
tree | a82e68fbfc7ab2c1768b76a8aea9341350da10ec /pkgs/desktops | |
parent | f8c360148e582baa6d30413c8f0d3434330f9377 (diff) |
Added CUPS administration tools in kdeadmin
svn path=/nixpkgs/trunk/; revision=14457
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/kde-4.2/admin/builder.sh | 13 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.2/admin/default.nix | 9 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.2/bindings/builder.sh | 18 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.2/bindings/default.nix | 12 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.2/default.nix | 10 |
5 files changed, 41 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 0000000000000..09cb930f04984 --- /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 cddaa97f52877..a741525b07100 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 73684b4aad89e..e3f1df28b77cb 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 0109a6c5ce1a7..712f321bef25b 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 afab963f580aa..1ee4a0e90098a 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 { |