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

tch'>
<input type='hidden' name='id' value='1bd44b425b79e9da160b33a9b19d01973b44772e'/><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=1bd44b425b79e9da160b33a9b19d01973b44772e'>root</a>/<a href='/guix/log/gnu?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>gnu</a>/<a href='/guix/log/gnu/packages?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>patches</a>/<a href='/guix/log/gnu/packages/patches/tcsh-fix-autotest.patch?id=1bd44b425b79e9da160b33a9b19d01973b44772e'>tcsh-fix-autotest.patch</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/patches/tcsh-fix-autotest.patch?id=1bd44b425b79e9da160b33a9b19d01973b44772e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-17 00:15:49 +0100'>2020-12-17</span></td><td><a href='/guix/commit/gnu/packages/patches/tcsh-fix-autotest.patch?id=bca05d07099703f37eaf3a0eab9b87ea3e472279'>gnu: tcsh: Update to 6.22.03.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/tcsh-fix-autotest.patch: Remove test hunk that no
longer applies.
* gnu/packages/shells.scm (tcsh): Update to 6.22.03.
[arguments]: Patch /usr/bin/env invocation.  Adjust the test mention above
with a substitution instead.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-12-05 17:59:10 +0100'>2019-12-05</span></td><td><a href='/guix/commit/gnu/packages/patches/tcsh-fix-autotest.patch?id=d098aa3e67b934f61758430c4740cd86d1ff234d'>gnu: tcsh: Update to 6.22.02.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/tcsh-fix-autotest.patch: Adjust for 6.22.02.
* gnu/packages/patches/tcsh-fix-out-of-bounds-read.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/shells.scm (tcsh): Update to 6.22.02.
[source](patches): Remove obsolete patch.
</span></span></td><td>Marius Bakke</td></tr>