From e24d7319d4f804c0637cc0b188f45315f8bdd772 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 3 Aug 2010 10:38:02 +0000 Subject: [PATCH] Use callPackage in kde45 svn path=/nixpkgs/trunk/; revision=22921 --- pkgs/desktops/kde-4.5/default.nix | 76 ++++++------------------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 17 insertions(+), 63 deletions(-) diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 230292a7077..23bb40dd3cf 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -1,79 +1,33 @@ -pkgs: +callPackage : -pkgs.recurseIntoAttrs (rec { +{ ### SUPPORT - akonadi = import ./support/akonadi { - inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost - mysql; - inherit automoc4 soprano; - }; + akonadi = callPackage ./support/akonadi { }; - attica = import ./support/attica { - inherit (pkgs) stdenv fetchurl cmake qt4; - }; + attica = callPackage ./support/attica { }; - automoc4 = import ./support/automoc4 { - inherit (pkgs) stdenv fetchurl cmake qt4; - }; + automoc4 = callPackage ./support/automoc4 { }; - oxygen_icons = import ./support/oxygen-icons { - inherit (pkgs) stdenv fetchurl cmake; - }; + oxygen_icons = callPackage ./support/oxygen-icons { }; -# phonon = import ./support/phonon { -# inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio; -# inherit (pkgs.gst_all) gstreamer gstPluginsBase; -# inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs; -# inherit automoc4; -# }; -# - polkit_qt_1 = import ./support/polkit-qt-1 { - inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 glib polkit; - inherit automoc4; - }; + polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; - strigi = import ./support/strigi { - inherit (pkgs) stdenv fetchurl lib cmake perl; - inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore; - }; + strigi = callPackage ./support/strigi { }; - soprano = import ./support/soprano { - inherit (pkgs) stdenv fetchurl cmake cluceneCore redland libiodbc qt4; - }; + soprano = callPackage ./support/soprano { }; - qca2 = import ./support/qca2 { - inherit (pkgs) stdenv fetchurl which qt4; - }; + qca2 = callPackage ./support/qca2 { }; - qca2_ossl = import ./support/qca2/ossl.nix { - inherit (pkgs) stdenv fetchurl qt4 openssl; - inherit qca2; - inherit (pkgs) fetchsvn; - }; + qca2_ossl = callPackage ./support/qca2/ossl.nix { }; ### LIBS - kdelibs = import ./libs { - inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt; - inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info - kerberos acl attr shared_desktop_ontologies enchant libdbusmenu_qt; - inherit (pkgs) docbook_xsl docbook_xml_dtd_42; - inherit (pkgs.xlibs) libXScrnSaver; - inherit automoc4 strigi soprano qca2 attica polkit_qt_1; - }; + kdelibs = callPackage ./libs { }; - kdepimlibs = import ./pimlibs { - inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical - openldap shared_mime_info; - inherit kdelibs automoc4 akonadi soprano; - }; + kdepimlibs = callPackage ./pimlibs { }; ### DEVELOPMENT - kdebindings = import ./bindings { - inherit (pkgs) stdenv fetchurl cmake perl lib python sip zlib libpng pyqt4 - freetype fontconfig qt4 boost ruby; - inherit kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1; - }; + kdebindings = callPackage ./bindings { }; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34c4f04b44d..3e39a1c1abe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6583,13 +6583,13 @@ let stdenv = stdenv2; }); - kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // { + kde45 = import ../desktops/kde-4.5 (newScope ({ qt4 = qt47; pyqt4 = pyqt4.override { qt4 = qt47; }; libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; }; shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; }; stdenv = stdenv2; - }); + } // kde45) ); xfce = xfce4; xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);