evolution-with-plugins: added support for evolution-ews.
This commit is contained in:
parent
19e8aa6f13
commit
e44b3c5187
@ -32,14 +32,13 @@ with lib;
|
|||||||
|
|
||||||
###### implementation
|
###### implementation
|
||||||
|
|
||||||
config = mkIf config.services.gnome3.evolution-data-server.enable {
|
config =
|
||||||
|
let evolution-with-plugins = (import ../../../../.. {}).evolution-with-plugins; in
|
||||||
|
mkIf config.services.gnome3.evolution-data-server.enable {
|
||||||
|
environment.systemPackages = [ evolution-with-plugins ];
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.gnome3.evolution-data-server ];
|
services.dbus.packages = [ evolution-with-plugins ];
|
||||||
|
|
||||||
services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];
|
|
||||||
|
|
||||||
systemd.packages = [ pkgs.gnome3.evolution-data-server ];
|
|
||||||
|
|
||||||
|
systemd.packages = [ evolution-with-plugins ];
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server
|
{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution
|
||||||
, sqlite, gtk3, webkitgtk, libgdata, libmspack }:
|
, sqlite, gtk3, webkitgtk, libgdata, libmspack }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
evolution-data-server gnome3.evolution
|
evolution-data-server evolution
|
||||||
sqlite libgdata
|
sqlite libgdata
|
||||||
gtk3 webkitgtk
|
gtk3 webkitgtk
|
||||||
libmspack
|
libmspack
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
, libnotify
|
, libnotify
|
||||||
, gspell
|
, gspell
|
||||||
, evolution-data-server
|
, evolution-data-server
|
||||||
, adwaita-icon-theme
|
|
||||||
, gnome-desktop
|
|
||||||
, libgdata
|
, libgdata
|
||||||
, libgweather
|
, libgweather
|
||||||
, glib-networking
|
, glib-networking
|
||||||
@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
adwaita-icon-theme
|
gnome3.adwaita-icon-theme
|
||||||
bogofilter
|
bogofilter
|
||||||
db
|
db
|
||||||
evolution-data-server
|
evolution-data-server
|
||||||
@ -69,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
glib
|
glib
|
||||||
glib-networking
|
glib-networking
|
||||||
gnome-desktop
|
gnome3.gnome-desktop
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
gst_all_1.gst-plugins-base
|
gst_all_1.gst-plugins-base
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
@ -115,6 +113,10 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./moduledir_from_env.patch
|
||||||
|
];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = gnome3.updateScript {
|
updateScript = gnome3.updateScript {
|
||||||
packageName = "evolution";
|
packageName = "evolution";
|
@ -0,0 +1,21 @@
|
|||||||
|
diff --git a/src/shell/main.c b/src/shell/main.c
|
||||||
|
index 5d089225ca..030908d684 100644
|
||||||
|
--- a/src/shell/main.c
|
||||||
|
+++ b/src/shell/main.c
|
||||||
|
@@ -407,7 +407,15 @@ create_default_shell (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Load all shared library modules. */
|
||||||
|
- module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR);
|
||||||
|
+ const gchar *modules_directory = EVOLUTION_MODULEDIR;
|
||||||
|
+ const gchar *modules_directory_env;
|
||||||
|
+
|
||||||
|
+ modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR");
|
||||||
|
+ if (modules_directory_env &&
|
||||||
|
+ g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR))
|
||||||
|
+ modules_directory = g_strdup (modules_directory_env);
|
||||||
|
+
|
||||||
|
+ module_types = e_module_load_all_in_directory (modules_directory);
|
||||||
|
g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse);
|
||||||
|
|
||||||
|
flags = G_APPLICATION_HANDLES_OPEN |
|
@ -0,0 +1,41 @@
|
|||||||
|
{ lib, makeWrapper, symlinkJoin, evolution, evolution-ews, gnome3 }:
|
||||||
|
|
||||||
|
symlinkJoin {
|
||||||
|
name = "evolution-with-plugins";
|
||||||
|
paths = [ evolution evolution-ews gnome3.evolution-data-server];
|
||||||
|
|
||||||
|
buildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
postBuild = ''
|
||||||
|
for i in $out/bin/* $out/libexec/**; do
|
||||||
|
if [ ! -d $i ]; then
|
||||||
|
echo wrapping $i
|
||||||
|
wrapProgram $i \
|
||||||
|
--set LD_LIBRARY_PATH "$out/lib" \
|
||||||
|
--set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \
|
||||||
|
--set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \
|
||||||
|
--set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \
|
||||||
|
--set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \
|
||||||
|
--set EVOLUTION_MODULEDIR "$out/lib/evolution/modules"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
fixSymlink () {
|
||||||
|
local link=$1
|
||||||
|
local target=$(readlink $link);
|
||||||
|
local newtarget=$(sed "s@/nix/store/[^/]*/@$out/@" <<< "$target")
|
||||||
|
if [[ $target != $newtarget ]] && [[ -d $newtarget ]]; then
|
||||||
|
echo fixing link to point to $newtarget instead of $target
|
||||||
|
rm $link
|
||||||
|
ln -s $newtarget $link
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
fixSymlink $out/share/dbus-1/service
|
||||||
|
fixSymlink $out/lib/systemd/user
|
||||||
|
for i in $out/share/dbus-1/services/*.service $out/lib/systemd/user/*.service; do
|
||||||
|
echo fixing service file $i
|
||||||
|
sed -i "s@/nix/store/[^/]*/@$out/@" $i
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
}
|
@ -158,8 +158,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||||||
|
|
||||||
cheese = callPackage ./apps/cheese { };
|
cheese = callPackage ./apps/cheese { };
|
||||||
|
|
||||||
evolution = callPackage ./apps/evolution { };
|
|
||||||
|
|
||||||
file-roller = callPackage ./apps/file-roller { };
|
file-roller = callPackage ./apps/file-roller { };
|
||||||
|
|
||||||
gedit = callPackage ./apps/gedit { };
|
gedit = callPackage ./apps/gedit { };
|
||||||
|
@ -21822,6 +21822,8 @@ in
|
|||||||
inherit (gnome3) evince;
|
inherit (gnome3) evince;
|
||||||
evolution-data-server = gnome3.evolution-data-server;
|
evolution-data-server = gnome3.evolution-data-server;
|
||||||
evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
|
evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
|
||||||
|
evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
|
||||||
|
evolution-with-plugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { };
|
||||||
|
|
||||||
keepass = callPackage ../applications/misc/keepass { };
|
keepass = callPackage ../applications/misc/keepass { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user