diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2015-12-03 08:30:04 +0100 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-01-04 16:11:10 -0500 |
| commit | 2a6afac9055bc2cac29678b9e2ed0344cb32c39e (patch) | |
| tree | fa3f868d646d1ff40ef4b6775afcf22b361a0019 /gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch | |
| parent | c2e87caaa6b7efb9c18c46fd4f9d4370f68c8db7 (diff) | |
| download | guix-patches-2a6afac9055bc2cac29678b9e2ed0344cb32c39e.tar guix-patches-2a6afac9055bc2cac29678b9e2ed0344cb32c39e.tar.gz | |
gnu: gtk+-2: Add patch to support GUIX_GTK2_PATH.
* gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/gtk.scm (gtk+-2) [source]: Add patch.
[native-search-paths]: Add search path for GUIX_GTK2_PATH.
Diffstat (limited to 'gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch')
| -rw-r--r-- | gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch b/gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch new file mode 100644 index 0000000000..93a8ddc242 --- /dev/null +++ b/gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch @@ -0,0 +1,46 @@ +This patch makes GTK+ look for additional modules in a list of directories +specified by the environment variable "GUIX_GTK2_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 2014-09-29 22:02:17.000000000 +0200 ++++ b/gtk/gtkmodules.c 2015-12-02 18:41:53.306396938 +0100 +@@ -55,6 +55,7 @@ + get_module_path (void) + { + const gchar *module_path_env; ++ const gchar *module_guix_gtk2_path_env; + const gchar *exe_prefix; + const gchar *home_dir; + gchar *home_gtk_dir = NULL; +@@ -70,6 +71,7 @@ + home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL); + + module_path_env = g_getenv ("GTK_PATH"); ++ module_guix_gtk2_path_env = g_getenv ("GUIX_GTK2_PATH"); + exe_prefix = g_getenv ("GTK_EXE_PREFIX"); + + if (exe_prefix) +@@ -77,9 +79,21 @@ + else + default_dir = g_build_filename (GTK_LIBDIR, "gtk-2.0", NULL); + +- if (module_path_env && home_gtk_dir) ++ if (module_guix_gtk2_path_env && module_path_env && home_gtk_dir) ++ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, ++ module_guix_gtk2_path_env, module_path_env, home_gtk_dir, default_dir, NULL); ++ else if (module_guix_gtk2_path_env && home_gtk_dir) ++ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, ++ module_guix_gtk2_path_env, home_gtk_dir, default_dir, NULL); ++ else if (module_guix_gtk2_path_env && module_path_env) ++ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, ++ module_guix_gtk2_path_env, module_path_env, default_dir, NULL); ++ else if (module_path_env && home_gtk_dir) + module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, + module_path_env, home_gtk_dir, default_dir, NULL); ++ else if (module_guix_gtk2_path_env) ++ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, ++ module_guix_gtk2_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); |