From b8f6cffb1151fc44da4e66e7a1ea0070b8984111 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 12:18:02 +0100 Subject: [PATCH] gnu: sugar-toolkit-gtk3: Include output directory in GI_TYPELIB_PATH. * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]: Include package output directory in search path for GI_TYPELIB_PATH. --- gnu/packages/sugar.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 3c5b7e0a55..1257f6607a 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -293,18 +293,19 @@ (define-public sugar-toolkit-gtk3 ((guix build python-build-system) #:prefix python:) (guix build utils)) #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'patch-build-system - (lambda _ - (substitute* "autogen.sh" - (("^\"\\$srcdir/configure" m) - (string-append "#" m))))) - (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/sugar-activity3") - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") - ,(python:site-packages inputs outputs))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-build-system + (lambda _ + (substitute* "autogen.sh" + (("^\"\\$srcdir/configure" m) + (string-append "#" m))))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/sugar-activity3") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") + ,(python:site-packages inputs outputs))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH") + ,(string-append #$output "/lib/girepository-1.0"))))))))) (inputs (list alsa-lib libice