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); tr>
path: root/gnu/packages/debug.scm
AgeCommit message (Expand)Author
2022-03-06gnu: cgdb: Reference gdb....* gnu/packages/debug.scm (cgdb)[inputs]: Add gdb, bash-minimal [arguments]: Add phase to fix hardcoded gdb and sh paths Add configure flags for cross-compilation Signed-off-by: Ludovic Courtès <ludo@gnu.org> Chadwain Holness
2022-02-16gnu: c-vise: Fix linkage....* gnu/packages/debug.scm (c-vise)[arguments][#:phases]: Fix linkage to clang and llvm shared libraries. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Greg Hogan
2022-02-02gnu: cgdb: Update to 0.8.0....* gnu/packages/debug.scm (cgdb): Update to 0.8.0. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Michael Rohleder
2022-02-02gnu: rr: Update to 5.5.0....* gnu/packages/debug.scm (rr): Update to 5.5.0. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Michael Rohleder
2022-02-01gnu: LLVM: Switch to 13 as the default....* gnu/packages/llvm.scm (llvm, clang-runtime, clang, clang-toolchain): Use version 13. * gnu/packages/gnuzilla.scm (mozjs-78)[native-inputs]: Change from LLVM to LLVM-9. * gnu/packages/rust.scm (rust-1.39, rust-1.40)[inputs]: Likewise. * gnu/packages/debug.scm (c-reduce)[inputs]: Stick with CLANG-9 and/or LLVM-9. * gnu/packages/diffoscope.scm (diffoscope)[inputs]: Likewise. * gnu/packages/linux.scm (bcc, bpftrace)[inputs]: Likewise. * gnu/packages/llvm.scm (libclc, libomp)[native-inputs]: Likewise. * gnu/packages/games.scm (hedgewars)[native-inputs]: Likewise. * gnu/packages/graphics.scm (openshadinglanguage)[native-inputs]: Likewise. * gnu/packages/opencl.scm (pocl)[inputs]: Likewise. Marius Bakke
2022-01-07gnu: c-vise: Update to 2.4.0....* gnu/packages/debug.scm (c-vise)[source]: Update to 2.4.0. [inputs]: Use list syntax. Add python-chardet. Eric Bavier
2021-12-17gnu: Add cgdb....* gnu/packages/debug.scm (cgdb): New variable. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr> Foo Chuan Wei
2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès