From 889294a93fc6464c2c2919bc47f6fd85ec823363 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Tue, 18 May 2021 19:57:00 -0400
Subject: [PATCH] [PATCH]: Honor GUIX_GTK4_PATH.

This patch makes GTK look for additional modules in a list of directories
specified by the environment variable "GUIX_GTK4_PATH". This can be used
instead of "GTK_PATH" to make GTK find modules that are incompatible with
other major versions of GTK.
---
 gtk/gtkmodules.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index aace5dcbc9..193b6a02e9 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -105,6 +105,7 @@ static char **
 get_module_path (void)
 {
   const char *module_path_env;
+  const gchar *module_guix_gtk4_path_env;
   const char *exe_prefix;
   char *module_path;
   char *default_dir;
@@ -114,6 +115,7 @@ get_module_path (void)
     return result;
 
   module_path_env = g_getenv ("GTK_PATH");
+  module_guix_gtk4_path_env = g_getenv ("GUIX_GTK4_PATH");
   exe_prefix = g_getenv ("GTK_EXE_PREFIX");
 
   if (exe_prefix)
@@ -121,7 +123,13 @@ get_module_path (void)
   else
     default_dir = g_build_filename (_gtk_get_libdir (), "gtk-4.0", NULL);
 
-  if (module_path_env)
+  if (module_guix_gtk4_path_env && module_path_env)
+    module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+				module_guix_gtk4_path_env, module_path_env, default_dir, NULL);
+  else if (module_guix_gtk4_path_env)
+    module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+				module_guix_gtk4_path_env, default_dir, NULL);
+  else if (module_path_env)
     module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
 				module_path_env, default_dir, NULL);
   else
-- 
2.31.1

thor'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=5d446d6b6a196a7838b9102172cffcc3ebd18487'>root</a>/<a href='/guix/log/gnu?id=5d446d6b6a196a7838b9102172cffcc3ebd18487'>gnu</a>/<a href='/guix/log/gnu/services?id=5d446d6b6a196a7838b9102172cffcc3ebd18487'>services</a>/<a href='/guix/log/gnu/services/guix.scm?id=5d446d6b6a196a7838b9102172cffcc3ebd18487'>guix.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/guix.scm?id=5d446d6b6a196a7838b9102172cffcc3ebd18487&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-03-08 23:35:03 +0000'>2020-03-08</span></td><td><a href='/guix/commit/gnu/services/guix.scm?id=d8ab68b92941ca0286697b87a88254023a0b2dc9'>services: guix-data-service: Allow passing extra options.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is so that the options supported by the service configuration don't have
to always be changed. Generally though all options should be explicitly
supported and documented, so this is mostly to facilitate experimentation.

* gnu/services/guix.scm (&lt;guix-data-service-configuration&gt;): Add extra-options
and extra-process-jobs-options to the record type.
(guix-data-service-shepherd-services): Handle these new configuration record
fields.
* doc/guix.texi (Guix Data Service): Document these new options.
</span></span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2019-09-25 08:35:33 +0100'>2019-09-25</span></td><td><a href='/guix/commit/gnu/services/guix.scm?id=dd2a83270bccb539439b2fc831d0db04e5276f11'>services: Add the Guix Data Service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/guix.scm: New file.
* gnu/tests/guix.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add both new files.
* doc/guix.texi (Guix Services): New section documenting the Guix Data
Service.
</span></span></td><td>Christopher Baines</td></tr>