summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-06-01 23:31:22 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-06-01 23:31:22 +0200
commitf3ed5297392fd7fe9cb6fc003824ce34130e80bd (patch)
tree0c4ae3c1c2c26217ba3d7ccfb015fb7938816631
parente642f78f2eaf1d53d656ff3cd86d4dd186e8eb52 (diff)
downloadguix-f3ed5297392fd7fe9cb6fc003824ce34130e80bd.tar.gz
gnu: geany: Fix crash when displaying file selection
* gnu/packages/text-editors.scm (geany)[arguments]: Wrap GTK to prevent errors
when opening file selection menu.
-rw-r--r--gnu/packages/text-editors.scm11
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 9e73959dd8..0095fcd839 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -821,7 +821,12 @@ and multiple fonts.")
      `(("gtk+" ,gtk+)
        ("scintilla" ,scintilla)))
     (arguments
-     `(#:phases
+     `(#:imported-modules ((guix build glib-or-gtk-build-system)
+                           ,@%gnu-build-system-modules)
+       #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+                  (guix build gnu-build-system)
+                  (guix build utils))
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'use-scintilla-shared-library
            (lambda* (#:key inputs #:allow-other-keys)
@@ -838,7 +843,9 @@ and multiple fonts.")
              (substitute* "tests/Makefile.am"
                (("AM_LDFLAGS =" all) (string-append all " -lscintilla")))
              (for-each delete-file (list "autogen.sh" "configure" "Makefile.in"))
-             #t)))))
+             #t))
+         (add-after 'install 'glib-or-gtk-wrap
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (home-page "https://www.geany.org")
     (synopsis "Fast and lightweight IDE")
     (description "Geany is a small and fast Integrated Development