[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#29764] [PATCH] gnu: lollypop: Use meson-build-system.

From: Thomas Danckaert
Subject: [bug#29764] [PATCH] gnu: lollypop: Use meson-build-system.
Date: Mon, 18 Dec 2017 11:19:16 +0100 (CET)

Hi Guix,

this patch replaces the “pseudo meson build system” for lollypop by the real thing ;-) (By the way, the current build doesn't succeed anymore.)

>From fb89164e2983ebb61b0920d52fcce04d6ac9e9da Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <address@hidden>
Date: Mon, 18 Dec 2017 11:10:27 +0100
Subject: [PATCH] gnu: lollypop: Use meson-build-system.

* gnu/packages/gnome.scm (lollypop) [build-system]: Use meson-build-system.
[arguments]: Remove phases for "pseudo meson build system", enable
[native-inputs]: Add glib:bin and gtk+:bin, remove ninja.
[inputs]: Remove gtk+ and meson.
 gnu/packages/gnome.scm | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7b93ddd14..71a675169 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6925,47 +6925,31 @@ views can be printed as PDF or PostScript files, or 
exported to HTML.")
-    ;; TODO: Use meson-build-system
-    (build-system glib-or-gtk-build-system)
+    (build-system meson-build-system)
-     `(#:imported-modules ((guix build python-build-system)
-                           ,@%glib-or-gtk-build-system-modules)
+     `(#:glib-or-gtk? #t
        #:tests? #f ; no test suite
        (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               ;; remove post-install script, we update the caches later
-               (substitute* ""
-                 (("meson.add_install_script\\(''\\)") 
-               (zero?
-                 (system* "meson" "builddir" (string-append "--prefix=" 
-         (replace 'install
-           (lambda _ (zero? (system* "ninja" "-C" "builddir" "install"))))
          (add-after 'install 'wrap-program
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out               (assoc-ref outputs "out"))
                    (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
                (wrap-program (string-append out "/bin/lollypop")
                  `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
-             #t))
-         (add-after 'install 'wrap
-           (@@ (guix build python-build-system) wrap)))))
+             #t)))))
      `(("intltool" ,intltool)
        ("itstool" ,itstool)
-       ("ninja" ,ninja)
+       ("glib:bin" ,glib "bin")         ; For glib-compile-resources
+       ("gtk+:bin" ,gtk+ "bin")         ; For gtk-update-icon-cache
        ("pkg-config" ,pkg-config)))
      `(("gobject-introspection" ,gobject-introspection)
        ("gst-plugins-base" ,gst-plugins-base)
-       ("gtk+" ,gtk+)
        ("libnotify" ,libnotify)
        ("libsecret" ,libsecret)
        ("libsoup" ,libsoup)
-       ("meson" ,meson)
        ("python" ,python)
        ("python-beautifulsoup4" ,python-beautifulsoup4)
        ("python-gst" ,python-gst)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]