git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #103135 from symphorien/pr/92775

Evolution ews: wrap evolution and evolution data server, fix nixos module.

commit7ed3d2df76cd1f637c6163858ac0e1db9cdf7b00 authorGuillaume Girol <symphorien@users.noreply.github.com> dateThu 21 Jan 2021, 19:42 (6 years ago) parentafa23b8f45f22d
8 files changed+108−29
nixos/modules/services/desktops/gnome3/evolution-data-server.nix+34−20 pkgs/applications/misc/almanah/default.nix+2−1 pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix+2−2 pkgs/desktops/gnome-3/apps/evolution/default.nix → pkgs/applications/networking/mailreaders/evolution/evolution/default.nix+6−4 pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch+21 pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix+41 pkgs/desktops/gnome-3/default.nix−2 pkgs/top-level/all-packages.nix+2
nixos/modules/services/desktops/gnome3/evolution-data-server.nix+34−20
@@ -15,31 +15,45 @@ with lib;
1515 options = {
1616
1717 services.gnome3.evolution-data-server = {
18−
19− enable = mkOption {
20− type = types.bool;
21− default = false;
22− description = ''
23− Whether to enable Evolution Data Server, a collection of services for
24− storing addressbooks and calendars.
25− '';
18+ enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars.";
19+ plugins = mkOption {
20+ type = types.listOf types.package;
21+ default = [ ];
22+ description = "Plugins for Evolution Data Server.";
2623 };
27−
2824 };
25+ programs.evolution = {
26+ enable = mkEnableOption "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality.";
27+ plugins = mkOption {
28+ type = types.listOf types.package;
29+ default = [ ];
30+ example = literalExample "[ pkgs.evolution-ews ]";
31+ description = "Plugins for Evolution.";
32+ };
2933
34+ };
3035 };
3136
32−
3337 ###### implementation
3438
35− config = mkIf config.services.gnome3.evolution-data-server.enable {
36−
37− environment.systemPackages = [ pkgs.gnome3.evolution-data-server ];
38−
39− services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];
40−
41− systemd.packages = [ pkgs.gnome3.evolution-data-server ];
42−
43− };
44−
39+ config =
40+ let
41+ bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome3.evolution-data-server) plugins; };
42+ in
43+ mkMerge [
44+ (mkIf config.services.gnome3.evolution-data-server.enable {
45+ environment.systemPackages = [ bundle ];
46+
47+ services.dbus.packages = [ bundle ];
48+
49+ systemd.packages = [ bundle ];
50+ })
51+ (mkIf config.programs.evolution.enable {
52+ services.gnome3.evolution-data-server = {
53+ enable = true;
54+ plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins;
55+ };
56+ services.gnome3.gnome-keyring.enable = true;
57+ })
58+ ];
4559}
pkgs/applications/misc/almanah/default.nix+2−1
@@ -4,6 +4,7 @@
44, cairo
55, desktop-file-utils
66, evolution-data-server
7+, evolution
78, gcr
89, gettext
910, glib
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
4849 evolution-data-server
4950 gcr
5051 glib
51− gnome3.evolution
52+ evolution
5253 gpgme
5354 gtk3
5455 gtksourceview3
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server
1+{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution
22, sqlite, gtk3, webkitgtk, libgdata, libmspack }:
33
44stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 nativeBuildInputs = [ cmake gettext intltool pkg-config ];
1414
1515 buildInputs = [
16− evolution-data-server gnome3.evolution
16+ evolution-data-server evolution
1717 sqlite libgdata
1818 gtk3 webkitgtk
1919 libmspack
pkgs/desktops/gnome-3/apps/evolution/default.nix → pkgs/applications/networking/mailreaders/evolution/evolution/default.nixrenamed+6−4
@@ -12,8 +12,6 @@
1212, libnotify
1313, gspell
1414, evolution-data-server
15−, adwaita-icon-theme
16−, gnome-desktop
1715, libgdata
1816, libgweather
1917, glib-networking
@@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
6159 ];
6260
6361 buildInputs = [
64− adwaita-icon-theme
62+ gnome3.adwaita-icon-theme
6563 bogofilter
6664 db
6765 evolution-data-server
@@ -69,7 +67,7 @@ stdenv.mkDerivation rec {
6967 gdk-pixbuf
7068 glib
7169 glib-networking
72− gnome-desktop
70+ gnome3.gnome-desktop
7371 gsettings-desktop-schemas
7472 gst_all_1.gst-plugins-base
7573 gst_all_1.gstreamer
@@ -115,6 +113,10 @@ stdenv.mkDerivation rec {
115113
116114 doCheck = true;
117115
116+ patches = [
117+ ./moduledir_from_env.patch
118+ ];
119+
118120 passthru = {
119121 updateScript = gnome3.updateScript {
120122 packageName = "evolution";
pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patchnew file+21
@@ -0,0 +1,21 @@
1+diff --git a/src/shell/main.c b/src/shell/main.c
2+index 5d089225ca..030908d684 100644
3+--- a/src/shell/main.c
4++++ b/src/shell/main.c
5+@@ -407,7 +407,15 @@ create_default_shell (void)
6+ }
7+
8+ /* Load all shared library modules. */
9+- module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR);
10++ const gchar *modules_directory = EVOLUTION_MODULEDIR;
11++ const gchar *modules_directory_env;
12++
13++ modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR");
14++ if (modules_directory_env &&
15++ g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR))
16++ modules_directory = g_strdup (modules_directory_env);
17++
18++ module_types = e_module_load_all_in_directory (modules_directory);
19+ g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse);
20+
21+ flags = G_APPLICATION_HANDLES_OPEN |
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nixnew file+41
@@ -0,0 +1,41 @@
1+{ lib, makeWrapper, symlinkJoin, gnome3, plugins }:
2+
3+symlinkJoin {
4+ name = "evolution-with-plugins";
5+ paths = [ gnome3.evolution-data-server ] ++ plugins;
6+
7+ buildInputs = [ makeWrapper ];
8+
9+ postBuild = ''
10+ for i in $out/bin/* $out/libexec/**; do
11+ if [ ! -d $i ]; then
12+ echo wrapping $i
13+ wrapProgram $i \
14+ --set LD_LIBRARY_PATH "$out/lib" \
15+ --set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \
16+ --set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \
17+ --set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \
18+ --set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \
19+ --set EVOLUTION_MODULEDIR "$out/lib/evolution/modules"
20+ fi
21+ done
22+
23+ fixSymlink () {
24+ local link=$1
25+ local target=$(readlink $link);
26+ local newtarget=$(sed "s@/nix/store/[^/]*/@$out/@" <<< "$target")
27+ if [[ $target != $newtarget ]] && [[ -d $newtarget ]]; then
28+ echo fixing link to point to $newtarget instead of $target
29+ rm $link
30+ ln -s $newtarget $link
31+ fi
32+ }
33+
34+ fixSymlink $out/share/dbus-1/service
35+ fixSymlink $out/lib/systemd/user
36+ for i in $out/share/dbus-1/services/*.service $out/lib/systemd/user/*.service; do
37+ echo fixing service file $i to point to $out
38+ sed -i "s@/nix/store/[^/]*/@$out/@" $i
39+ done
40+ '';
41+}
pkgs/desktops/gnome-3/default.nix−2
@@ -158,8 +158,6 @@ lib.makeScope pkgs.newScope (self: with self; {
158158
159159 cheese = callPackage ./apps/cheese { };
160160
161− evolution = callPackage ./apps/evolution { };
162−
163161 file-roller = callPackage ./apps/file-roller { };
164162
165163 gedit = callPackage ./apps/gedit { };
pkgs/top-level/all-packages.nix+2
@@ -21688,6 +21688,8 @@ in
2168821688 inherit (gnome3) evince;
2168921689 evolution-data-server = gnome3.evolution-data-server;
2169021690 evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
21691+ evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
21692+ evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; };
2169121693
2169221694 keepass = callPackage ../applications/misc/keepass { };
2169321695