From d01cf7e3c3d667068e36f55c3b759d0db5482ca0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: virt-viewer: Fix build. * gnu/packages/spice.scm (virt-viewer)[arguments]: Add a new 'build-with-recent-meson phase. --- gnu/packages/spice.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 98faaed940..d0cef54c1d 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -386,16 +386,26 @@ share smart cards from client system to local or remote virtual machines.") (define-public virt-viewer (package (name "virt-viewer") + ;; XXX Remove the 'build-with-recent-meson phase when updating. (version "11.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://virt-manager.org/download/sources/virt-viewer/" - "virt-viewer-" version ".tar.xz")) - (sha256 - (base32 - "1l5bv6x6j21l487mk3n93ai121gg62n6b069r2jpf72cbhra4gx4")))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://virt-manager.org/download/sources/virt-viewer/" + "virt-viewer-" version ".tar.xz")) + (sha256 + (base32 "1l5bv6x6j21l487mk3n93ai121gg62n6b069r2jpf72cbhra4gx4")))) (build-system meson-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'build-with-recent-meson + ;; Fix ‘ERROR: Function does not take positional arguments.’ + (lambda _ + (substitute* "data/meson.build" + (("i18n\\.merge_file \\(.*" match) + (string-append match "#")))))))) (native-inputs (list `(,glib "bin") gettext-minimal -- cgit 1.4.1