Author: urkud
Date: Mon Aug 2 17:12:39 2010
New Revision: 22890
URL: https://svn.nixos.org/websvn/nix/?rev=22890&sc=1
Log:
Add polkit-qt-1, strigi, kdelibs-4.4.92
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/polkit-qt-1/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/strigi/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/strigi/default.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Mon Aug 2 17:11:19
2010 (r22889)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Mon Aug 2 17:12:39
2010 (r22890)
@@ -14,6 +14,16 @@
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 {
+ inherit (pkgs) stdenv fetchurl lib cmake perl;
+ inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
+ };
+
soprano = import ./support/soprano {
inherit (pkgs) stdenv fetchurl cmake cluceneCore redland libiodbc qt4;
};
@@ -37,4 +47,13 @@
inherit qca2;
};
+### LIBS
+ kdelibs = import ./libs {
+ 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
+ kerberos acl attr shared_desktop_ontologies enchant libdbusmenu_qt;
+ inherit (pkgs) docbook_xsl docbook_xml_dtd_42;
+ inherit (pkgs.xlibs) libXScrnSaver;
+ inherit automoc4 phonon strigi soprano qca2 attica polkit_qt_1;
+ };
})
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Mon Aug 2
17:12:39 2010 (r22890)
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, cmake, lib, perl
+, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
+, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr,
shared_desktop_ontologies, libXScrnSaver
+, automoc4, phonon, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
+}:
+
+stdenv.mkDerivation rec {
+ name = "kdelibs-4.4.92";
+
+ src = fetchurl {
+ url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
+ sha256 = "03hqn50fls3bpd9xls3bga4g1n4gy1hcxs1dk6wlc2dfklyqshz3";
+ };
+
+ buildInputs = [
+ cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
+ shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
+ libXScrnSaver enchant libdbusmenu_qt polkit_qt_1
+ automoc4 phonon strigi soprano qca2 attica
+ ];
+
+ propagatedBuildInputs = [ shared_desktop_ontologies stdenv.gcc.libc ];
+
+ # cmake fails to find acl.h because of C++-style comment
+ cmakeFlags = [
+ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"
+ "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+ "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+ ];
+
+ meta = {
+ description = "KDE libraries";
+ license = "LGPL";
+ homepage = http://www.kde.org;
+ maintainers = [ lib.maintainers.sander ];
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix Mon Aug
2 17:12:39 2010 (r22890)
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
+
+stdenv.mkDerivation rec {
+ name = "polkit-qt-1-0.96.1";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
+ sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
+ };
+
+ buildInputs = [ cmake qt4 automoc4 ];
+ propagatedBuildInputs = [ polkit glib ];
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/strigi/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/strigi/default.nix Mon Aug
2 17:12:39 2010 (r22890)
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
+, cluceneCore
+}:
+
+stdenv.mkDerivation rec {
+ name = "strigi-0.7.1";
+
+ src = fetchurl {
+ url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2";;
+ sha256 = "1cra4jlpd7cdvckwalfjrf2224qvhbkmxdd3sn02q9jhv830b0yi";
+ };
+ includeAllQtDirs=true;
+
+ CLUCENE_HOME = cluceneCore;
+
+ # Dependencies such as SQLite and FAM are unreliable in this release
+ buildInputs = [
+ cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore
+ ];
+
+ meta = {
+ homepage = http://strigi.sourceforge.net;
+ description = "A very fast and efficient crawler to index data on your
harddrive";
+ license = "LGPL";
+ maintainers = [ lib.maintainers.sander ];
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 17:11:19
2010 (r22889)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 17:12:39
2010 (r22890)
@@ -6580,7 +6580,7 @@
});
kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // {
- openexr = openexr_1_6_1;
+ shared_desktop_ontologies = shared_desktop_ontologies.override { v =
"0.5"; };
stdenv = stdenv2;
});
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
