Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/src/nautilus-module.c b/src/nautilus-module.c 2index cd889ff18..e2cd6468e 100644 3--- a/src/nautilus-module.c 4+++ b/src/nautilus-module.c 5@@ -267,6 +267,7 @@ void 6 nautilus_module_setup (void) 7 { 8 static gboolean initialized = FALSE; 9+ const gchar* extensiondir = NULL; 10 const gchar *disable_plugins; 11 12 disable_plugins = g_getenv ("NAUTILUS_DISABLE_PLUGINS"); 13@@ -280,7 +281,12 @@ nautilus_module_setup (void) 14 { 15 initialized = TRUE; 16 17- load_module_dir (NAUTILUS_EXTENSIONDIR); 18+ extensiondir = g_getenv ("NAUTILUS_4_EXTENSION_DIR"); 19+ if (extensiondir == NULL) { 20+ extensiondir = NAUTILUS_EXTENSIONDIR; 21+ } 22+ 23+ load_module_dir (extensiondir); 24 }