Author: urkud
Date: Mon Aug 2 17:11:19 2010
New Revision: 22889
URL: https://svn.nixos.org/websvn/nix/?rev=22889&sc=1
Log:
Add parts of kdesupport for kde-4.5
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Mon Aug 2 17:11:19
2010 (r22889)
@@ -0,0 +1,40 @@
+pkgs:
+
+pkgs.recurseIntoAttrs (rec {
+
+### SUPPORT
+ automoc4 = import ./support/automoc4 {
+ inherit (pkgs) stdenv fetchurl cmake qt4;
+ };
+
+ 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;
+ };
+
+ soprano = import ./support/soprano {
+ 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 {
+ inherit (pkgs) stdenv fetchurl which qt4;
+ };
+
+ qca2_ossl = import ./support/qca2/ossl.nix {
+ inherit (pkgs) stdenv fetchurl qt4 openssl;
+ inherit qca2;
+ };
+
+})
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix Mon Aug
2 16:51:33 2010 (r22888)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix Mon Aug
2 17:11:19 2010 (r22889)
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, lib, cmake, qt4}:
+{stdenv, fetchurl, cmake, qt4}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "automoc4-0.9.88";
src = fetchurl {
- url = mirror://kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2;
- md5 = "91bf517cb940109180ecd07bc90c69ec";
+ url = "mirror://kde/stable/automoc4/0.9.88/${name}.tar.bz2";
+ sha256 = "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93";
};
buildInputs = [ cmake qt4 ];
meta = {
description = "KDE Meta Object Compiler";
license = "BSD";
- maintainers = [ lib.maintainers.sander ];
+ maintainers = [ stdenv.lib.maintainers.sander ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/default.nix Mon Aug
2 16:51:33 2010 (r22888)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/default.nix Mon Aug
2 17:11:19 2010 (r22889)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, which, qt4}:
+{stdenv, fetchurl, which, qt4}:
stdenv.mkDerivation {
name = "qca-2.0.2";
@@ -7,10 +7,10 @@
sha256 =
"49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
};
buildInputs = [ which qt4 ];
- meta = {
+ meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture";
license = "LGPL";
homepage = http://delta.affinix.com/qca;
- maintainers = [ lib.maintainers.sander ];
+ maintainers = [ maintainers.sander maintainers.urkud ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl.nix Mon Aug 2
16:51:33 2010 (r22888)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl.nix Mon Aug 2
17:11:19 2010 (r22889)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, qt4, qca2, openssl}:
+{stdenv, fetchurl, qt4, qca2, openssl}:
stdenv.mkDerivation rec {
name = "qca-ossl-2.0.0-beta3";
@@ -14,10 +14,10 @@
configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
'';
patches = [ ./ossl-remove-whirlpool.patch ];
- meta = {
+ meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture OpenSSL plugin";
license = "LGPL";
homepage = http://delta.affinix.com/qca;
- maintainers = [ lib.maintainers.urkud ];
+ maintainers = [ maintainers.urkud ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/default.nix Mon Aug
2 16:51:33 2010 (r22888)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/default.nix Mon Aug
2 17:11:19 2010 (r22889)
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland, libiodbc}:
+{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
stdenv.mkDerivation rec {
- name = "soprano-2.4.63";
+ name = "soprano-2.4.64";
src = fetchurl {
url = "mirror://sf/soprano/${name}.tar.bz2";
- sha256 = "0iqs0dy5d0pgf2x3vpigwvs8vp7mvfvzimkdw7dvqlqbbld05qbf";
+ sha256 = "1jrpgp573r2q20v108a0528f92n7g892pdr44fgskcq7wf8l8mzv";
};
# We disable the Java backend, since we do not need them and they make the
closure size much bigger
@@ -15,7 +15,7 @@
homepage = http://soprano.sourceforge.net/;
description = "An object-oriented C++/Qt4 framework for RDF data";
license = "LGPL";
- maintainers = with lib.maintainers; [ sander urkud ];
- platforms = qt4.meta.platforms;
+ maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+ inherit (qt4.meta) platforms;
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 16:51:33
2010 (r22888)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 17:11:19
2010 (r22889)
@@ -6579,6 +6579,11 @@
stdenv = stdenv2;
});
+ kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // {
+ openexr = openexr_1_6_1;
+ stdenv = stdenv2;
+ });
+
xfce = xfce4;
xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
