diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-13 10:42:59 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-13 10:42:59 +0000 |
commit | 5b91408a0d5c1e5004f5091e45f9394e6daf96c4 (patch) | |
tree | f9674458aa1df43ff3d6938f8c1bae9ade3eba96 | |
parent | 547207de2893409794bdd2178084ab5ada5275ce (diff) |
* Pass `pkgs' to the top-level KDE function instead of passing every
dependency explicitly. The KDE packages still declare their dependencies as explicit function arguments. svn path=/nixpkgs/trunk/; revision=14067
-rw-r--r-- | pkgs/desktops/kde-4.2/default.nix | 31 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.2/libs/default.nix | 19 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 27 insertions, 31 deletions
diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index b90e51635596c..0376b4006c432 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -1,36 +1,31 @@ -{stdenv, fetchurl, cmake, qt4, xlibs, bzip2, libxml2, libxslt, perl, exiv2, aspell, -pthread_stubs, gst_all, xineLib, fam, log4cxx, cluceneCore, redland, avahi, jdk, -pcre, jasper, openexr, shared_mime_info, giflib}: +pkgs: rec { ### SUPPORT automoc4 = import ./support/automoc4 { - inherit stdenv fetchurl cmake; - inherit qt4; + inherit (pkgs) stdenv fetchurl cmake; + inherit (pkgs) qt4; }; phonon = import ./support/phonon { - inherit stdenv fetchurl cmake; - inherit qt4 pthread_stubs gst_all xineLib; - inherit (xlibs) libXau libXdmcp; + inherit (pkgs) stdenv fetchurl cmake; + inherit (pkgs) qt4 pthread_stubs gst_all xineLib; + inherit (pkgs.xlibs) libXau libXdmcp; inherit automoc4; }; strigi = import ./support/strigi { - inherit stdenv fetchurl cmake perl; - inherit bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore; + inherit (pkgs) stdenv fetchurl cmake perl; + inherit (pkgs) bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore; }; soprano = import ./support/soprano { - inherit stdenv fetchurl cmake; - inherit qt4 jdk cluceneCore redland; + inherit (pkgs) stdenv fetchurl cmake; + inherit (pkgs) qt4 jdk cluceneCore redland; }; ### LIBS - kdelibs = import ./libs { - 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; - }; + kdelibs = import ./libs (pkgs // { + inherit automoc4 phonon strigi soprano; + }); } diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix index 66248f78d99f7..c6ef7fc476789 100644 --- a/pkgs/desktops/kde-4.2/libs/default.nix +++ b/pkgs/desktops/kde-4.2/libs/default.nix @@ -1,15 +1,20 @@ -{stdenv, fetchurl, cmake, perl, - qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper, - openexr, aspell, avahi, - automoc4, phonon, strigi, soprano}: +{ stdenv, fetchurl, cmake, perl +, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper +, openexr, aspell, avahi +, automoc4, phonon, strigi, soprano, ... +}: stdenv.mkDerivation { name = "kdelibs-4.2.0"; + src = fetchurl { url = mirror://kde/stable/4.2.0/src/kdelibs-4.2.0.tar.bz2; md5 = "2d830a922195fefe6e073111850247ac"; }; - buildInputs = [ cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt - shared_mime_info giflib jasper openexr aspell avahi - automoc4 phonon strigi soprano ]; + + buildInputs = [ + cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt + shared_mime_info giflib jasper openexr aspell avahi + automoc4 phonon strigi soprano + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 117da8a4ef3ed..c27ab8aad1f97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9007,13 +9007,9 @@ let openexr = openexr_1_6_1 ; }); - kde42 = import ../desktops/kde-4.2 { - 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; + kde42 = import ../desktops/kde-4.2 (pkgs // { openexr = openexr_1_6_1; - }; + }); kdebase = import ../desktops/kde/kdebase { inherit |