diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-04-21 10:51:15 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-04-21 10:51:15 +0000 |
| commit | e2a374799fc9e93034fbb75b12f597b874cb00dd (patch) | |
| tree | aa8734e81af3566ba0efe5adf52009c844a30d0c /pkgs/desktops | |
| parent | 8d9ac92768e2781c742a3dc9b7e0e2b976c966f5 (diff) | |
| download | nixpkgs-e2a374799fc9e93034fbb75b12f597b874cb00dd.tar nixpkgs-e2a374799fc9e93034fbb75b12f597b874cb00dd.tar.gz nixpkgs-e2a374799fc9e93034fbb75b12f597b874cb00dd.tar.bz2 nixpkgs-e2a374799fc9e93034fbb75b12f597b874cb00dd.tar.lz nixpkgs-e2a374799fc9e93034fbb75b12f597b874cb00dd.tar.xz nixpkgs-e2a374799fc9e93034fbb75b12f597b874cb00dd.tar.zst nixpkgs-e2a374799fc9e93034fbb75b12f597b874cb00dd.zip | |
* Reverted most of the recent Python refactorings, as discussed. It's
a worthy goal to move the Python packages that are currently in all-packages.nix into a single attribute set, but this doesn't require moving python-packages.nix or the other changes made to that file. The Python packages in all-packages.nix should simply be moved to python-packages.nix, and ideally changed to use buildPythonPackage. svn path=/nixpkgs/trunk/; revision=21196
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 3e71c3aad5e..9623f309fc9 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -102,8 +102,7 @@ pkgs.recurseIntoAttrs (rec { }; kdeadmin = import ./admin { - inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 system_config_printer; - inherit (pkgs.pythonPackages) pycups rhpl; + inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon; }; @@ -187,8 +186,7 @@ pkgs.recurseIntoAttrs (rec { }; kdeutils = import ./utils { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 system_config_printer; - inherit (pkgs.pythonPackages) pycups rhpl; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer; inherit kdelibs kdepimlibs kdebase kdebindings; inherit automoc4 phonon qimageblitz qca2; }; |