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

* Pass `pkgs' to the top-level KDE function instead of passing every

Browse Source 
dependency explicitly.  The KDE packages still declare their
  dependencies as explicit function arguments.

svn path=/nixpkgs/trunk/; revision=14067
This commit is contained in:
Eelco Dolstra 2009-02-13 10:42:59 +00:00
parent 547207de28
commit 5b91408a0d
3 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,36 +1,31 @@
{stdenv, fetchurl, cmake, qt4, xlibs, bzip2, libxml2, libxslt, perl, exiv2, aspell, pkgs:
pthread_stubs, gst_all, xineLib, fam, log4cxx, cluceneCore, redland, avahi, jdk,
pcre, jasper, openexr, shared_mime_info, giflib}:
rec { rec {
### SUPPORT ### SUPPORT
automoc4 = import ./support/automoc4 { automoc4 = import ./support/automoc4 {
inherit stdenv fetchurl cmake; inherit (pkgs) stdenv fetchurl cmake;
inherit qt4; inherit (pkgs) qt4;
}; };
phonon = import ./support/phonon { phonon = import ./support/phonon {
inherit stdenv fetchurl cmake; inherit (pkgs) stdenv fetchurl cmake;
inherit qt4 pthread_stubs gst_all xineLib; inherit (pkgs) qt4 pthread_stubs gst_all xineLib;
inherit (xlibs) libXau libXdmcp; inherit (pkgs.xlibs) libXau libXdmcp;
inherit automoc4; inherit automoc4;
}; };
strigi = import ./support/strigi { strigi = import ./support/strigi {
inherit stdenv fetchurl cmake perl; inherit (pkgs) stdenv fetchurl cmake perl;
inherit bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore; inherit (pkgs) bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore;
}; };
soprano = import ./support/soprano { soprano = import ./support/soprano {
inherit stdenv fetchurl cmake; inherit (pkgs) stdenv fetchurl cmake;
inherit qt4 jdk cluceneCore redland; inherit (pkgs) qt4 jdk cluceneCore redland;
}; };
### LIBS ### LIBS
kdelibs = import ./libs { kdelibs = import ./libs (pkgs // {
inherit stdenv fetchurl cmake perl;
inherit qt4 bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper;
inherit openexr aspell avahi;
inherit automoc4 phonon strigi soprano; inherit automoc4 phonon strigi soprano;
}; });
} }

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

@ -1,15 +1,20 @@
{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 {
name = "kdelibs-4.2.0"; name = "kdelibs-4.2.0";
src = fetchurl { src = fetchurl {
url = mirror://kde/stable/4.2.0/src/kdelibs-4.2.0.tar.bz2; url = mirror://kde/stable/4.2.0/src/kdelibs-4.2.0.tar.bz2;
md5 = "2d830a922195fefe6e073111850247ac"; md5 = "2d830a922195fefe6e073111850247ac";
}; };
buildInputs = [ cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt
buildInputs = [
cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt
shared_mime_info giflib jasper openexr aspell avahi shared_mime_info giflib jasper openexr aspell avahi
automoc4 phonon strigi soprano ]; automoc4 phonon strigi soprano
];
} }

8
pkgs/top-level/all-packages.nix
View File

@ -9007,13 +9007,9 @@ let
openexr = openexr_1_6_1 ; openexr = openexr_1_6_1 ;
}); });
kde42 = import ../desktops/kde-4.2 { kde42 = import ../desktops/kde-4.2 (pkgs // {
inherit stdenv fetchurl cmake jdk;
inherit xlibs qt4 bzip2 libxml2 libxslt perl pcre exiv2 aspell;
inherit pthread_stubs gst_all xineLib fam log4cxx cluceneCore;
inherit redland avahi jasper shared_mime_info giflib;
openexr = openexr_1_6_1; openexr = openexr_1_6_1;
}; });
kdebase = import ../desktops/kde/kdebase { kdebase = import ../desktops/kde/kdebase {
inherit inherit