Inherit from pythonPackages, not pkgs

svn path=/nixpkgs/trunk/; revision=21152
This commit is contained in:
Yury G. Kudryashov 2010-04-19 09:29:06 +00:00
parent b8fc0df586
commit 6338c68dcd

View File

@ -106,7 +106,8 @@ pkgs.recurseIntoAttrs (rec {
}; };
kdeadmin = import ./admin { 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 kdelibs kdepimlibs kdebindings;
inherit automoc4 phonon; inherit automoc4 phonon;
}; };
@ -190,7 +191,8 @@ pkgs.recurseIntoAttrs (rec {
}; };
kdeutils = import ./utils { 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 kdelibs kdepimlibs kdebase kdebindings;
inherit automoc4 phonon qimageblitz qca2; inherit automoc4 phonon qimageblitz qca2;
}; };