aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch
blob: aa63a544028d5685cb4a6899d0003cc501aa7cf6 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
This patch replaces the environment variable "GTK_IM_MODULE" with
"GUIX_GTK3_IM_MODULE_FILE" to prevent this version of GTK+ from loading input
method modules for other major versions of GTK+.

--- gtk+-3.20.3/gtk/deprecated/gtkrc.c	2016-08-21 22:40:48.168437905 +0200
+++ gtk+-3.20.3/gtk/deprecated/gtkrc.c	2016-08-23 10:12:09.097070097 +0200
@@ -768,7 +768,7 @@
 gchar *
 gtk_rc_get_im_module_file (void)
 {
-  const gchar *var = g_getenv ("GTK_IM_MODULE_FILE");
+  const gchar *var = g_getenv ("GUIX_GTK3_IM_MODULE_FILE");
   gchar *result = NULL;
 
   if (var)
ed to load libraries, so define it using the OCAMLPATH variable generated during build time. Related issues: - <https://issues.guix.gnu.org/54094> (fixes it). - <https://issues.guix.gnu.org/69996> (only Frama-C fixed from this one). * gnu/packages/maths.scm (frama-c) <arguments>: Add wrap-programs phase. Change-Id: Icc8a0be5fed6678b71649da2e39a83caaaee9df2 Signed-off-by: jgart <jgart@dismail.de>
Diffstat
-rw-r--r--gnu/packages/maths.scm15
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4bea32dcbe..de8e886485 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -9548,9 +9548,20 @@ of C, Java, or Ada programs.")
#~(modify-phases %standard-phases
(add-before 'build 'set-env
(lambda _
- (setenv "CC" "gcc"))))))
+ (setenv "CC" "gcc")))
+ (add-after 'install 'wrap-programs
+ (lambda _
+ (let ((ocamlpath
+ `(,(string-append #$output "/lib/ocaml/site-lib")
+ ,@(search-path-as-string->list
+ (getenv "OCAMLPATH")))))
+ (for-each
+ (lambda (program)
+ (wrap-program (string-append #$output "/bin/" program)
+ `("OCAMLPATH" ":" prefix ,ocamlpath)))
+ '("frama-c" "frama-c-gui"))))))))
(inputs
- (list gmp zlib))
+ (list bash-minimal gmp zlib))
(propagated-inputs (list
graphviz
lablgtk3