Use callPackage in kde45
svn path=/nixpkgs/trunk/; revision=22921
This commit is contained in:
parent
057a044b0c
commit
e24d7319d4
|
@ -1,79 +1,33 @@
|
||||||
pkgs:
|
callPackage :
|
||||||
|
|
||||||
pkgs.recurseIntoAttrs (rec {
|
{
|
||||||
|
|
||||||
### SUPPORT
|
### SUPPORT
|
||||||
akonadi = import ./support/akonadi {
|
akonadi = callPackage ./support/akonadi { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost
|
|
||||||
mysql;
|
|
||||||
inherit automoc4 soprano;
|
|
||||||
};
|
|
||||||
|
|
||||||
attica = import ./support/attica {
|
attica = callPackage ./support/attica { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
automoc4 = import ./support/automoc4 {
|
automoc4 = callPackage ./support/automoc4 { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
oxygen_icons = import ./support/oxygen-icons {
|
oxygen_icons = callPackage ./support/oxygen-icons { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake;
|
|
||||||
};
|
|
||||||
|
|
||||||
# phonon = import ./support/phonon {
|
polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
|
||||||
# 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;
|
|
||||||
};
|
|
||||||
|
|
||||||
strigi = import ./support/strigi {
|
strigi = callPackage ./support/strigi { };
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake perl;
|
|
||||||
inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
|
|
||||||
};
|
|
||||||
|
|
||||||
soprano = import ./support/soprano {
|
soprano = callPackage ./support/soprano { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake cluceneCore redland libiodbc qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
qca2 = import ./support/qca2 {
|
qca2 = callPackage ./support/qca2 { };
|
||||||
inherit (pkgs) stdenv fetchurl which qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
qca2_ossl = import ./support/qca2/ossl.nix {
|
qca2_ossl = callPackage ./support/qca2/ossl.nix { };
|
||||||
inherit (pkgs) stdenv fetchurl qt4 openssl;
|
|
||||||
inherit qca2;
|
|
||||||
inherit (pkgs) fetchsvn;
|
|
||||||
};
|
|
||||||
|
|
||||||
### LIBS
|
### LIBS
|
||||||
kdelibs = import ./libs {
|
kdelibs = callPackage ./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;
|
|
||||||
};
|
|
||||||
|
|
||||||
kdepimlibs = import ./pimlibs {
|
kdepimlibs = callPackage ./pimlibs { };
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical
|
|
||||||
openldap shared_mime_info;
|
|
||||||
inherit kdelibs automoc4 akonadi soprano;
|
|
||||||
};
|
|
||||||
|
|
||||||
### DEVELOPMENT
|
### DEVELOPMENT
|
||||||
|
|
||||||
kdebindings = import ./bindings {
|
kdebindings = callPackage ./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;
|
|
||||||
};
|
|
||||||
|
|
||||||
})
|
}
|
||||||
|
|
|
@ -6583,13 +6583,13 @@ let
|
||||||
stdenv = stdenv2;
|
stdenv = stdenv2;
|
||||||
});
|
});
|
||||||
|
|
||||||
kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // {
|
kde45 = import ../desktops/kde-4.5 (newScope ({
|
||||||
qt4 = qt47;
|
qt4 = qt47;
|
||||||
pyqt4 = pyqt4.override { qt4 = qt47; };
|
pyqt4 = pyqt4.override { qt4 = qt47; };
|
||||||
libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
|
libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
|
||||||
shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
|
shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
|
||||||
stdenv = stdenv2;
|
stdenv = stdenv2;
|
||||||
});
|
} // kde45) );
|
||||||
|
|
||||||
xfce = xfce4;
|
xfce = xfce4;
|
||||||
xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
|
xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
|
||||||
|
|
Loading…
Reference in a new issue