mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: flatpak: Update to 1.16.0.
* gnu/packages/package-management.scm (flatpak): Update to 1.16.0. [build-system]: Switch to meson-build-system, which is now the recommended build system upstream. [arguments]<#:configure-flags>: Use equivalent options for meson. <#:phases>: Enable running more tests, disabling a select few in new 'disable-failing-tests phase. Remove 'check phase override. Add 'pre-check phase. Add 'wrap-flatpak phase so GIO can still find TLS backend with the build system change. [native-inputs]: Add gtk-doc. [inputs]: Add bash-minimal. Change-Id: Iacf5c527e7a1cce7f418cecf73bb89018fcec71e Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
This commit is contained in:
parent
627c6423a1
commit
251fed72a7
1 changed files with 30 additions and 22 deletions
|
@ -25,6 +25,7 @@
|
||||||
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
|
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
|
||||||
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
|
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
|
||||||
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
|
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
|
||||||
|
;;; Copyright © 2025 aurtzy <aurtzy@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -2037,40 +2038,42 @@ the boot loader configuration.")
|
||||||
(define-public flatpak
|
(define-public flatpak
|
||||||
(package
|
(package
|
||||||
(name "flatpak")
|
(name "flatpak")
|
||||||
(version "1.14.10")
|
(version "1.16.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
|
(uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
|
||||||
version "/flatpak-" version ".tar.xz"))
|
version "/flatpak-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1k91v0csghiis8gjpcvpx534qbyaj81dfisabbc0ld97h68cggbb"))
|
(base32 "0ajbz8ms4h5nyjr59hv9z8vaimj4f3p51v8idmy14qnbmmjwa2nb"))
|
||||||
(patches
|
(patches
|
||||||
(search-patches "flatpak-fix-fonts-icons.patch"
|
(search-patches "flatpak-fix-fonts-icons.patch"
|
||||||
"flatpak-fix-path.patch"
|
"flatpak-fix-path.patch"
|
||||||
"flatpak-fix-icon-validation.patch"
|
"flatpak-fix-icon-validation.patch"
|
||||||
"flatpak-unset-gdk-pixbuf-for-sandbox.patch"))))
|
"flatpak-unset-gdk-pixbuf-for-sandbox.patch"))))
|
||||||
|
(build-system meson-build-system)
|
||||||
;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
|
|
||||||
;; find the TLS backend in glib-networking.
|
|
||||||
(build-system glib-or-gtk-build-system)
|
|
||||||
|
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
#~(list
|
#~(list
|
||||||
"--with-curl"
|
"-Dsystem_helper=disabled"
|
||||||
"--enable-documentation=no" ;; FIXME
|
"-Dlocalstatedir=/var"
|
||||||
"--enable-system-helper=no"
|
(string-append "-Dsystem_bubblewrap="
|
||||||
"--localstatedir=/var"
|
|
||||||
(string-append "--with-system-bubblewrap="
|
|
||||||
(assoc-ref %build-inputs "bubblewrap")
|
(assoc-ref %build-inputs "bubblewrap")
|
||||||
"/bin/bwrap")
|
"/bin/bwrap")
|
||||||
(string-append "--with-system-dbus-proxy="
|
(string-append "-Dsystem_dbus_proxy="
|
||||||
(assoc-ref %build-inputs "xdg-dbus-proxy")
|
(assoc-ref %build-inputs "xdg-dbus-proxy")
|
||||||
"/bin/xdg-dbus-proxy"))
|
"/bin/xdg-dbus-proxy"))
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'disable-failing-tests
|
||||||
|
(lambda _
|
||||||
|
(substitute* "tests/test-matrix/meson.build"
|
||||||
|
;; The following tests fail with error message related to fusermount3
|
||||||
|
;; failing an unmount operation ("No such file or directory").
|
||||||
|
(("^.*test-http-utils.*$") "")
|
||||||
|
(("^.*test-summaries@system.wrap.*$") "")
|
||||||
|
(("^.*test-prune.*$") ""))))
|
||||||
(add-after 'unpack 'fix-tests
|
(add-after 'unpack 'fix-tests
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(copy-recursively
|
(copy-recursively
|
||||||
|
@ -2101,20 +2104,24 @@ cp -r /tmp/locale/*/en_US.*")))
|
||||||
(store (dirname out)))
|
(store (dirname out)))
|
||||||
(substitute* "icon-validator/validate-icon.c"
|
(substitute* "icon-validator/validate-icon.c"
|
||||||
(("@storeDir@") store)))))
|
(("@storeDir@") store)))))
|
||||||
;; Many tests fail for unknown reasons, so we just run a few basic
|
(add-before 'check 'pre-check
|
||||||
;; tests.
|
(lambda _
|
||||||
(replace 'check
|
;; Set $HOME to writable location for testcommon tests.
|
||||||
(lambda* (#:key tests? #:allow-other-keys)
|
(setenv "HOME" "/tmp")))
|
||||||
(when tests?
|
(add-after 'install 'wrap-flatpak
|
||||||
(setenv "HOME" "/tmp")
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(invoke "make" "check"
|
(let ((flatpak (string-append #$output "/bin/flatpak"))
|
||||||
"TESTS=tests/test-basic.sh tests/test-config.sh
|
(glib-networking (assoc-ref inputs "glib-networking")))
|
||||||
testcommon")))))))
|
(wrap-program flatpak
|
||||||
|
;; Allow GIO to find TLS backend.
|
||||||
|
`("GIO_EXTRA_MODULES" prefix
|
||||||
|
(,(string-append glib-networking "/lib/gio/modules"))))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list bison
|
(list bison
|
||||||
dbus ; for dbus-daemon
|
dbus ; for dbus-daemon
|
||||||
gettext-minimal
|
gettext-minimal
|
||||||
`(,glib "bin") ; for glib-mkenums + gdbus-codegen
|
`(,glib "bin") ; for glib-mkenums + gdbus-codegen
|
||||||
|
gtk-doc
|
||||||
(libc-utf8-locales-for-target)
|
(libc-utf8-locales-for-target)
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
libcap
|
libcap
|
||||||
|
@ -2126,6 +2133,7 @@ cp -r /tmp/locale/*/en_US.*")))
|
||||||
(inputs
|
(inputs
|
||||||
(list appstream
|
(list appstream
|
||||||
appstream-glib
|
appstream-glib
|
||||||
|
bash-minimal
|
||||||
bubblewrap
|
bubblewrap
|
||||||
curl
|
curl
|
||||||
dconf
|
dconf
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue