From 6338c68dcd173efe81fed21646535095be72eb51 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Apr 2010 09:29:06 +0000 Subject: [PATCH] Inherit from pythonPackages, not pkgs svn path=/nixpkgs/trunk/; revision=21152 --- pkgs/desktops/kde-4.4/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index c6715c9021a..e4d064798cc 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -106,7 +106,8 @@ pkgs.recurseIntoAttrs (rec { }; kdeadmin = import ./admin { - inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer; + inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 rhpl system_config_printer; + inherit (pkgs.pythonPackages) pycups; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon; }; @@ -190,7 +191,8 @@ pkgs.recurseIntoAttrs (rec { }; kdeutils = import ./utils { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 system_config_printer; + inherit (pkgs.pythonPackages) pycups rhpl; inherit kdelibs kdepimlibs kdebase kdebindings; inherit automoc4 phonon qimageblitz qca2; };