diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-03 12:56:57 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-03 12:56:57 +0000 |
commit | 3687f56e7ac75e4f527802d88cc64bbba47acd61 (patch) | |
tree | 38da42c3446e2be513227261471cb130157a4af6 /pkgs/desktops | |
parent | b6943f0056f7b1386172ba3d4b4b6a4854a1c4fc (diff) | |
download | nixlib-3687f56e7ac75e4f527802d88cc64bbba47acd61.tar nixlib-3687f56e7ac75e4f527802d88cc64bbba47acd61.tar.gz nixlib-3687f56e7ac75e4f527802d88cc64bbba47acd61.tar.bz2 nixlib-3687f56e7ac75e4f527802d88cc64bbba47acd61.tar.lz nixlib-3687f56e7ac75e4f527802d88cc64bbba47acd61.tar.xz nixlib-3687f56e7ac75e4f527802d88cc64bbba47acd61.tar.zst nixlib-3687f56e7ac75e4f527802d88cc64bbba47acd61.zip |
* Drop the rhpl dependency in kdeadmin and kdeutils because it doesn't
build. svn path=/nixpkgs/branches/stdenv-updates/; revision=19779
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/kde-4.3/admin/default.nix | 11 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.3/utils/default.nix | 11 |
3 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/desktops/kde-4.3/admin/default.nix b/pkgs/desktops/kde-4.3/admin/default.nix index 71282a23721b..5dd8d30bb215 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 48ba9fc65a32..9fa61fa4881a 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 005a3e3cdba3..ced47d57b4a4 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"; |