small fixes, kdepimlibs, oxygen-icons
svn path=/nixpkgs/trunk/; revision=22891
This commit is contained in:
parent
695b150844
commit
5245e8f885
|
@ -3,10 +3,24 @@ pkgs:
|
||||||
pkgs.recurseIntoAttrs (rec {
|
pkgs.recurseIntoAttrs (rec {
|
||||||
|
|
||||||
### SUPPORT
|
### SUPPORT
|
||||||
|
akonadi = import ./support/akonadi {
|
||||||
|
inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost
|
||||||
|
mysql;
|
||||||
|
inherit automoc4 soprano;
|
||||||
|
};
|
||||||
|
|
||||||
|
attica = import ./support/attica {
|
||||||
|
inherit (pkgs) stdenv fetchurl cmake qt4;
|
||||||
|
};
|
||||||
|
|
||||||
automoc4 = import ./support/automoc4 {
|
automoc4 = import ./support/automoc4 {
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4;
|
inherit (pkgs) stdenv fetchurl cmake qt4;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
oxygen_icons = import ./support/oxygen-icons {
|
||||||
|
inherit (pkgs) stdenv fetchurl cmake;
|
||||||
|
};
|
||||||
|
|
||||||
phonon = import ./support/phonon {
|
phonon = import ./support/phonon {
|
||||||
inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio;
|
inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio;
|
||||||
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
|
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
|
||||||
|
@ -16,28 +30,18 @@ pkgs.recurseIntoAttrs (rec {
|
||||||
|
|
||||||
polkit_qt_1 = import ./support/polkit-qt-1 {
|
polkit_qt_1 = import ./support/polkit-qt-1 {
|
||||||
inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 glib polkit;
|
inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 glib polkit;
|
||||||
inherit automoc4;
|
inherit automoc4;
|
||||||
};
|
};
|
||||||
|
|
||||||
strigi = import ./support/strigi {
|
strigi = import ./support/strigi {
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake perl;
|
inherit (pkgs) stdenv fetchurl lib cmake perl;
|
||||||
inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
|
inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
|
||||||
};
|
};
|
||||||
|
|
||||||
soprano = import ./support/soprano {
|
soprano = import ./support/soprano {
|
||||||
inherit (pkgs) stdenv fetchurl cmake cluceneCore redland libiodbc qt4;
|
inherit (pkgs) stdenv fetchurl cmake cluceneCore redland libiodbc qt4;
|
||||||
};
|
};
|
||||||
|
|
||||||
akonadi = import ./support/akonadi {
|
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost
|
|
||||||
mysql;
|
|
||||||
inherit automoc4 soprano;
|
|
||||||
};
|
|
||||||
|
|
||||||
attica = import ./support/attica {
|
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4;
|
|
||||||
};
|
|
||||||
|
|
||||||
qca2 = import ./support/qca2 {
|
qca2 = import ./support/qca2 {
|
||||||
inherit (pkgs) stdenv fetchurl which qt4;
|
inherit (pkgs) stdenv fetchurl which qt4;
|
||||||
};
|
};
|
||||||
|
@ -46,14 +50,20 @@ pkgs.recurseIntoAttrs (rec {
|
||||||
inherit (pkgs) stdenv fetchurl qt4 openssl;
|
inherit (pkgs) stdenv fetchurl qt4 openssl;
|
||||||
inherit qca2;
|
inherit qca2;
|
||||||
};
|
};
|
||||||
|
|
||||||
### LIBS
|
### LIBS
|
||||||
kdelibs = import ./libs {
|
kdelibs = import ./libs {
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
|
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
|
||||||
inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
|
inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
|
||||||
kerberos acl attr shared_desktop_ontologies enchant libdbusmenu_qt;
|
kerberos acl attr shared_desktop_ontologies enchant libdbusmenu_qt;
|
||||||
inherit (pkgs) docbook_xsl docbook_xml_dtd_42;
|
inherit (pkgs) docbook_xsl docbook_xml_dtd_42;
|
||||||
inherit (pkgs.xlibs) libXScrnSaver;
|
inherit (pkgs.xlibs) libXScrnSaver;
|
||||||
inherit automoc4 phonon strigi soprano qca2 attica polkit_qt_1;
|
inherit automoc4 phonon strigi soprano qca2 attica polkit_qt_1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
kdepimlibs = import ./pimlibs {
|
||||||
|
inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical
|
||||||
|
openldap shared_mime_info;
|
||||||
|
inherit kdelibs automoc4 phonon akonadi;
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
21
pkgs/desktops/kde-4.5/pimlibs/default.nix
Normal file
21
pkgs/desktops/kde-4.5/pimlibs/default.nix
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
{ stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
|
||||||
|
, kdelibs, automoc4, phonon, akonadi}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "kdepimlibs-4.4.92";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
|
||||||
|
sha256 = "08y1fvacahv565vfvjjkg10cg660zbfqbqi8n280nxz73qgjmlj7";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
|
||||||
|
shared_mime_info kdelibs automoc4 phonon akonadi ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "KDE PIM libraries";
|
||||||
|
license = "LGPL";
|
||||||
|
homepage = http://www.kde.org;
|
||||||
|
inherit (kdelibs.meta) maintainers;
|
||||||
|
};
|
||||||
|
}
|
16
pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
Normal file
16
pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{stdenv, fetchurl, cmake}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "oxygen-icons-4.4.92";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
|
||||||
|
sha256 = "1aqc5p93c9jz660x94pxx7anamrpmwd490jy0lw38y99lbdhgz9k";
|
||||||
|
};
|
||||||
|
buildInputs = [ cmake ];
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "KDE Oxygen theme icons";
|
||||||
|
longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
|
||||||
|
license = "GPL";
|
||||||
|
maintainers = [ maintainers.sander ];
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in a new issue