guix-commits
[Top][All Lists]
Advanced

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

200/203: gnu: gvfs: Use meson-0.59 to workaround faulty meson.


From: guix-commits
Subject: 200/203: gnu: gvfs: Use meson-0.59 to workaround faulty meson.
Date: Wed, 3 Nov 2021 21:10:45 -0400 (EDT)

apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit 89705fdb82d38630b34968aaffa4b696fecddc91
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Nov 1 21:32:04 2021 -0400

    gnu: gvfs: Use meson-0.59 to workaround faulty meson.
    
    Meson 0.60 now hard fails on errors it previously only warned about.
    
    * gnu/packages/gnome.scm (gvfs)[meson]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6b45f0a..e2c23fc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6563,7 +6563,8 @@ part of udev-extras, then udev, then systemd.  It's now a 
project on its own.")
                 "1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj"))))
     (build-system meson-build-system)
     (arguments
-     '(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59
+       #:glib-or-gtk? #t
        #:configure-flags
        (list "-Dsystemduserunitdir=no"
              "-Dtmpfilesdir=no"
@@ -6571,7 +6572,7 @@ part of udev-extras, then udev, then systemd.  It's now a 
project on its own.")
              (string-append "-Dc_link_args=-Wl,-rpath="
                             (assoc-ref %outputs "out") "/lib/gvfs"))))
     (native-inputs
-     `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.
+     `(("glib:bin" ,glib "bin")         ;for glib-genmarshal, etc.
        ("gettext" ,gettext-minimal)
        ("gtk-doc" ,gtk-doc/stable)
        ("pkg-config" ,pkg-config)



reply via email to

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