This patch makes GTK+ look for additional modules in a list of directories
specified by the environment variable "GUIX_GTK3_PATH".  This can be used
instead of "GTK_PATH" to make GTK+ find modules that are incompatible with
other major versions of GTK+.

--- a/gtk/gtkmodules.c	2015-09-20 20:09:05.060590217 +0200
+++ b/gtk/gtkmodules.c	2015-09-20 20:10:33.423124833 +0200
@@ -52,6 +52,7 @@
 get_module_path (void)
 {
   const gchar *module_path_env;
+  const gchar *module_guix_gtk3_path_env;
   const gchar *exe_prefix;
   gchar *module_path;
   gchar *default_dir;
@@ -61,6 +62,7 @@
     return result;
 
   module_path_env = g_getenv ("GTK_PATH");
+  module_guix_gtk3_path_env = g_getenv ("GUIX_GTK3_PATH");
   exe_prefix = g_getenv ("GTK_EXE_PREFIX");
 
   if (exe_prefix)
@@ -68,7 +70,13 @@
   else
     default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL);
 
-  if (module_path_env)
+  if (module_guix_gtk3_path_env && module_path_env)
+    module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+				module_guix_gtk3_path_env, module_path_env, default_dir, NULL);
+  else if (module_guix_gtk3_path_env)
+    module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+				module_guix_gtk3_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
kages/java-bootstrap.scm?id=a50201fdc18067351e7d8e384b848430e125bbc6'>commit</a><a href='/guix/diff/gnu/packages/java-bootstrap.scm?id=a50201fdc18067351e7d8e384b848430e125bbc6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/java-bootstrap.scm'>
<input type='hidden' name='id' value='a50201fdc18067351e7d8e384b848430e125bbc6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>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=a50201fdc18067351e7d8e384b848430e125bbc6'>root</a>/<a href='/guix/log/gnu?id=a50201fdc18067351e7d8e384b848430e125bbc6'>gnu</a>/<a href='/guix/log/gnu/packages?id=a50201fdc18067351e7d8e384b848430e125bbc6'>packages</a>/<a href='/guix/log/gnu/packages/java-bootstrap.scm?id=a50201fdc18067351e7d8e384b848430e125bbc6'>java-bootstrap.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/packages/java-bootstrap.scm?id=a50201fdc18067351e7d8e384b848430e125bbc6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-09-26 18:13:29 +0300'>2024-09-26</span></td><td><a href='/guix/commit/gnu/packages/java-bootstrap.scm?id=3171ff971c1c8d230e4a22091c9322e87b8b6c9d'>gnu: classpath-jamvm-wrappers: Adjust wrapper for armhf-linux.</a><span class='msg-avail'>...<span class='msg-tooltip'>This fixes building icedtea-2 on armhf-linux.

* gnu/packages/java-bootstrap.scm (classpath-jamvm-wrappers)[arguments]:
Adjust the flags passed to jamvm in the wrapper script when building for
armhf-linux.

Change-Id: I68a47b0eec761b1be9126ac814693fba7fa7e56e
</span></span></td><td>Efraim Flashner</td></tr>