JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up the top-level KDE 4.2 expression a bit

Browse Source 
svn path=/nixpkgs/trunk/; revision=14100
This commit is contained in:
Sander van der Burg 2009-02-17 15:23:42 +00:00
parent da1904a231
commit 690d8bb443
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/desktops/kde-4.2/default.nix
View File

@ -29,10 +29,13 @@ rec {
}; };
### LIBS ### LIBS
kdelibs = import ./libs (pkgs // { kdelibs = import ./libs {
inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
inherit (pkgs) giflib jasper openexr aspell avahi shared_mime_info;
inherit automoc4 phonon strigi soprano; inherit automoc4 phonon strigi soprano;
}); };
### BASE
kdebase_workspace = import ./base-workspace { kdebase_workspace = import ./base-workspace {
inherit (pkgs) stdenv fetchurl cmake qt4 perl python; inherit (pkgs) stdenv fetchurl cmake qt4 perl python;
inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs; inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs;
@ -53,4 +56,11 @@ rec {
inherit kdelibs; inherit kdelibs;
inherit automoc4 phonon strigi soprano; inherit automoc4 phonon strigi soprano;
}; };
### ADDITIONAL
kdegraphics = import ./graphics {
inherit (pkgs) stdenv fetchurl cmake;
inherit kdelibs;
};
} }

2
pkgs/desktops/kde-4.2/libs/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, perl { stdenv, fetchurl, cmake, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, openexr, aspell, avahi , openexr, aspell, avahi
, automoc4, phonon, strigi, soprano, ... , automoc4, phonon, strigi, soprano
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {