branch master updated: gnu: lollypop: Peel off duplicate wrapper.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 7a9543d  gnu: lollypop: Peel off duplicate wrapper.
7a9543d is described below

commit 7a9543d77ec750d93a0a7832b115db1ae83195a3
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Thu Apr 2 14:39:09 2020 +0200

    gnu: lollypop: Peel off duplicate wrapper.
    
    * gnu/packages/gnome.scm (lollypop)[arguments]: Take down some at-ats
    with proper module imports and prefixing.  Remove the redundant
    ‘wrap-glib-or-gtk’ phaseis already run by the MESON-BUILD-SYSTEM.
---
 gnu/packages/gnome.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b29acf3..15b5d91 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8887,10 +8887,15 @@ views can be printed as PDF or PostScript files, or 
exported to HTML.")
         (base32 "1ng9492k8754vlqggbfsyzbmfdx4w17fzc4ad21fr92710na0w5a"))))
     (build-system meson-build-system)
     (arguments
-     `(#:imported-modules ((guix build python-build-system)
-                           ,@%meson-build-system-modules)
+     `(#:imported-modules
+       (,@%meson-build-system-modules
+        (guix build python-build-system))
+       #:modules
+       ((guix build meson-build-system)
+        ((guix build python-build-system) #:prefix python:)
+        (guix build utils))
        #:glib-or-gtk? #t
-       #:tests? #f ; no test suite
+       #:tests? #f                      ; no test suite
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap-program
@@ -8901,9 +8906,7 @@ views can be printed as PDF or PostScript files, or 
exported to HTML.")
                  `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
              #t))
          (add-after 'install 'wrap-python
-           (@@ (guix build python-build-system) wrap))
-         (add-after 'install 'wrap-glib-or-gtk
-           (@@ (guix build glib-or-gtk-build-system) wrap-all-programs)))))
+           (assoc-ref python:%standard-phases 'wrap)))))
     (native-inputs
      `(("intltool" ,intltool)
        ("itstool" ,itstool)