summary refs log tree commit diff
path: root/gnu/packages/freedesktop.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-12-17 12:40:28 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-01-10 11:44:29 -0500
commit41ec0573b81733e15b70312d81cf7fdf77dd63fe (patch)
tree4e95786550ac717bbebc24c7b5f4e3c46ecd1825 /gnu/packages/freedesktop.scm
parent6f36d0c89e3bf19bb7bb8f7f5b77de30c9af861b (diff)
downloadguix-41ec0573b81733e15b70312d81cf7fdf77dd63fe.tar.gz
gnu: Remove meson-0.59 workarounds.
Mostly automated with the following command:

$ grep --include='*.scm' '#:meson ,meson-0.59' -rl \
    | xargs sed -z 's/#:meson[^\n]*\s*//' -i

* gnu/packages/freedesktop.scm (malcontent)
(accountsservice): Delete #:meson argument.
* gnu/packages/games.scm (gnome-2048): Likewise.
* gnu/packages/geo.scm (gnome-maps): Likewise.
* gnu/packages/gnome.scm (gnome-photos, gnome-music)
(gnome-initial-setup, gnome-user-share, gnome-characters)
(gnome-disk-utility, gnome-font-viewer, evince, glade3)
(gnome-mines, gnome-sudoku, gnome-settings-daemon, devhelp)
(totem, eog, gvfs, simple-scan, epiphany, gnome-session, gedit)
(network-manager-applet, gnome-control-center, gnome-shell, nautilus)
(gnome-default-applications, gnome-weather, gnome-tweaks, cheese, gthumb)
(gitg, polari, gnome-boxes, gtranslator): Likewise.
* gnu/packages/gtk.scm: (gtkmm-3): Likewise.
* gnu/packages/pdf.scm (zathura): Likewise.
* gnu/packages/photo.scm (entangle): Likewise.
* gnu/packages/video.scm (pitivi): Likewise.
* gnu/packages/virtualization.scm (libvirt-glib): Likewise.
Diffstat (limited to 'gnu/packages/freedesktop.scm')
-rw-r--r--gnu/packages/freedesktop.scm6
1 files changed, 2 insertions, 4 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a7d400d3bf..844191a438 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -353,8 +353,7 @@ tests.")
         (base32 "0vnf0pk516fwwh41v96c29l2i7h1pnwhivlkbf53kkx1q35g7lb3"))))
     (build-system meson-build-system)
     (arguments
-     `(#:meson ,meson-0.59
-       #:glib-or-gtk? #t
+     `(#:glib-or-gtk? #t
        #:phases
        (modify-phases %standard-phases
          ;; AppInfo not available inside build environment.
@@ -1378,8 +1377,7 @@ message bus.")
         (base32 "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"))))
     (build-system meson-build-system)
     (arguments
-     `(#:meson ,meson-0.59 ;see https://github.com/mesonbuild/meson/issues/6470
-       #:tests? #f ; XXX: tests require DocBook 4.1.2
+     `(#:tests? #f ; XXX: tests require DocBook 4.1.2
        #:configure-flags
        '("--localstatedir=/var"
          "-Dsystemdsystemunitdir=/tmp/empty"