Author: eelco
Date: Fri Jul 29 19:05:52 2011
New Revision: 28008
URL: https://svn.nixos.org/websvn/nix/?rev=28008&sc=1
Log:
* Updated kdepim-runtime and kdepim.
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim-runtime.nix
- copied, changed from r27990,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim-runtime/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim.nix
- copied, changed from r27990,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs.nix
- copied unchanged from r27990,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs/default.nix
Deleted:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim/
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim-runtime/
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs/
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29
17:48:39 2011 (r28007)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29
19:05:52 2011 (r28008)
@@ -48,7 +48,7 @@
kdelibs = callPackage ./libs { };
- kdepimlibs = callPackage ./pimlibs { };
+ kdepimlibs = callPackage ./pimlibs.nix { };
### BASE
@@ -174,10 +174,9 @@
kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
};
- /*
- kdepim_runtime = callPackage ./pim-runtime { };
- kdepim = callPackage ./pim { };
- */
+ kdepim_runtime = callPackage ./pim-runtime.nix { };
+
+ kdepim = callPackage ./pim.nix { };
### DEVELOPMENT
Copied and modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim-runtime.nix (from r27990,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim-runtime/default.nix)
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim-runtime/default.nix
Thu Jul 28 14:09:16 2011 (r27990, copy source)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim-runtime.nix Fri Jul
29 19:05:52 2011 (r28008)
@@ -1,27 +1,17 @@
-{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
-, kdelibs, kdepimlibs
-, automoc4, phonon, akonadi, soprano, strigi}:
+{ kde, fetchurl, cmake, kdelibs, qt4, phonon, libxml2, libxslt, boost
+, kdepimlibs, automoc4, akonadi, soprano, strigi, shared_mime_info
+, shared_desktop_ontologies }:
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/@"
- '';
-
- src = fetchurl {
- url =
"mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2";
- sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
- };
+ buildInputs =
+ [ cmake kdelibs qt4 automoc4 phonon kdepimlibs akonadi strigi
+ soprano boost shared_mime_info shared_desktop_ontologies
+ libxml2 libxslt
+ ];
meta = {
description = "KDE PIM runtime";
- homepage = http://www.kde.org;
license = "GPL";
- kde = {
- name = "kdepim-runtime";
- version = "4.4.8";
- };
+ kde.name = "kdepim-runtime";
};
}
Copied and modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim.nix
(from r27990, nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim/default.nix)
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim/default.nix Thu Jul
28 14:09:16 2011 (r27990, copy source)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pim.nix Fri Jul 29
19:05:52 2011 (r28008)
@@ -1,34 +1,34 @@
-{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
-, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
-, automoc4, akonadi, qca2}:
+{ kde, fetchurl, cmake, boost, gpgme, libassuan, libxslt
+, kdelibs, kdepimlibs, kdepim_runtime
+, automoc4, akonadi, qt4, phonon, soprano, shared_desktop_ontologies
+, strigi, cyrus_sasl }:
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/@"
- '';
+ buildInputs =
+ [ cmake kdelibs qt4 automoc4 phonon kdepimlibs boost soprano
+ akonadi strigi shared_desktop_ontologies libxslt cyrus_sasl
+ gpgme libassuan
+ #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/@"
+ #'';
+
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.name}-${meta.kde.version}.tar.bz2";
- sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
- };
-
meta = {
description = "KDE PIM tools";
longDescription = ''
- Contains various personal information management tools for KDE, such as
an organizer
+ Contains various personal information management tools for KDE, such as
an organizer.
'';
license = "GPL";
homepage = http://pim.kde.org;
- kde = {
- name = "kdepim";
- version = "4.4.8";
- };
+ kde.name = "kdepim";
};
}
Copied: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs.nix (from
r27990, nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs.nix Fri Jul 29
19:05:52 2011 (r28008, copy of r27990,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs/default.nix)
@@ -0,0 +1,17 @@
+{ stdenv, kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap,
shared_mime_info
+, kdelibs, automoc4, akonadi, soprano, phonon, shared_desktop_ontologies,
libxslt }:
+
+kde.package {
+
+ buildInputs =
+ [ cmake kdelibs qt4 automoc4 phonon boost gpgme shared_mime_info
+ shared_desktop_ontologies soprano libical libxslt openldap
+ cyrus_sasl akonadi perl
+ ];
+
+ meta = {
+ description = "KDE PIM libraries";
+ license = "LGPL";
+ kde.name = "kdepimlibs";
+ };
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
