69698ec11c
* gnome3: only maintain single GNOME 3 package set GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources to update a single version of GNOME. Maintaining multiple versions just does not make sense. Additionally, it makes viewing history using most Git tools bothersome. This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes the config variable for choosing packageset (`environment.gnome3.packageSet`), updates the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`. Closes: #29329 * maintainers/scripts/gnome: Use fixed GNOME 3 directory Since we now allow only a single GNOME 3 package set, specifying the working directory is not necessary. This commit sets the directory to `pkgs/desktops/gnome-3`.
25 lines
670 B
Diff
25 lines
670 B
Diff
diff --git a/src/nautilus-module.c b/src/nautilus-module.c
|
|
index 6273a76..4adcc8a 100644
|
|
--- a/src/nautilus-module.c
|
|
+++ b/src/nautilus-module.c
|
|
@@ -242,11 +242,17 @@ void
|
|
nautilus_module_setup (void)
|
|
{
|
|
static gboolean initialized = FALSE;
|
|
+ const gchar* extensiondir = NULL;
|
|
|
|
if (!initialized)
|
|
{
|
|
initialized = TRUE;
|
|
|
|
- load_module_dir (NAUTILUS_EXTENSIONDIR);
|
|
+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
|
|
+ if (extensiondir == NULL) {
|
|
+ extensiondir = NAUTILUS_EXTENSIONDIR;
|
|
+ }
|
|
+
|
|
+ load_module_dir (extensiondir);
|
|
|
|
eel_debug_call_at_shutdown (free_module_objects);
|
|
}
|