From f3ed5297392fd7fe9cb6fc003824ce34130e80bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:31:22 +0200 Subject: 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. --- gnu/packages/text-editors.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/text-editors.scm') 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 @@ (define-public geany `(("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 @@ (define-public geany (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 -- cgit v1.2.3