evolution: 3.38.4 → 3.40.1
Co-Authored-By: Symphorien Gibol <symphorien+git@xlumurb.eu>
This commit is contained in:
parent
0ed59166be
commit
19c93ba01d
|
@ -42,11 +42,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.38.4";
|
||||
version = "3.40.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "NB+S0k4rRMJ4mwA38aiU/xZUh9qksAuA+uMTii4Fr9Q=";
|
||||
sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -114,10 +114,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
patches = [
|
||||
./moduledir_from_env.patch
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "evolution";
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
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 |
|
|
@ -10,13 +10,7 @@ symlinkJoin {
|
|||
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"
|
||||
wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}"
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
Loading…
Reference in a new issue