Author: urkud
Date: Sun Feb 13 04:37:08 2011
New Revision: 25939
URL: https://svn.nixos.org/websvn/nix/?rev=25939&sc=1
Log:
kdepim{,runtime}-4.5.94.1
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.6/pim-runtime/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.6/pim/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix Sun Feb 13 04:37:04
2011 (r25938)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix Sun Feb 13 04:37:08
2011 (r25939)
@@ -139,7 +139,6 @@
printer_applet = callPackage ./utils/printer-applet.nix { };
superkaramba = callPackage ./utils/superkaramba.nix { };
sweeper = callPackage ./utils/sweeper.nix { };
- wacomtablet = callPackage ./utils/wacomtablet.nix { };
};
kdewebdev = combinePkgs "kdewebdev" {
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.6/pim-runtime/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.6/pim-runtime/default.nix Sun Feb 13
04:37:04 2011 (r25938)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.6/pim-runtime/default.nix Sun Feb 13
04:37:08 2011 (r25939)
@@ -1,24 +1,25 @@
{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
-, kdelibs, kdepimlibs
+, kdelibs, kdepimlibs, gettext
, automoc4, phonon, akonadi, soprano, strigi}:
kde.package rec {
- buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
- kdelibs kdepimlibs
- automoc4 phonon akonadi soprano strigi ];
- prePatch = ''
- find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION
\''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION
\''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
- '';
+ name = with meta.kde; "${module}-${release}";
+
+ buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info kdelibs
+ kdepimlibs automoc4 phonon akonadi soprano strigi gettext ];
src = fetchurl {
- url =
"mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
- sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
+ url =
"mirror://kde/unstable/kdepim/${meta.kde.release}/src/${name}.tar.bz2";
+ sha256 = "0gsp1yycjb7a3p285yqhs6v9rsrpbq0wfq3jhz7ky306692lrxig";
};
meta = {
description = "KDE PIM runtime";
homepage = http://www.kde.org;
license = "GPL";
- kde.module = "kdepim-runtime";
+ kde = {
+ release = "4.5.94.1";
+ module = "kdepim-runtime";
+ };
};
}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.6/pim/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.6/pim/default.nix Sun Feb 13 04:37:04
2011 (r25938)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.6/pim/default.nix Sun Feb 13 04:37:08
2011 (r25939)
@@ -1,22 +1,20 @@
{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
-, automoc4, akonadi, qca2}:
+, automoc4, akonadi, qca2, gettext, grantlee}:
kde.package rec {
buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt
- shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ];
- prePatch = ''
- find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION
\''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION
\''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
- '';
+ shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi gettext
+ grantlee ];
postInstall = ''
mkdir -p $out/nix-support/
echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} >
$out/nix-support/propagated-user-env-packages
'';
src = fetchurl {
- url =
"mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
- sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
+ url =
"mirror://kde/unstable/kdepim/${meta.kde.release}/src/${meta.kde.module}-${meta.kde.release}.tar.bz2";
+ sha256 = "1bnlyrflcjy7lj4c2jag212ws2gzzpqyn5g2p97x8y936dza7ic3";
};
meta = {
@@ -26,6 +24,9 @@
'';
license = "GPL";
homepage = http://pim.kde.org;
- kde.module = "kdepim";
+ kde = {
+ release = "4.5.94.1";
+ module = "kdepim";
+ };
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
