ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: flatpak: Update to 1.6.3.

Browse source 
* gnu/packages/package-management.scm (flatpak): Update to 1.6.3.
[arguments]: Enable tests; add --with-system-dbus-proxy to configure flags;
add "fix-tests" phase and replace "check" phase.
[native-inputs]: Add socat, dbus, python, which, and glibc-utf8-locales.
[inputs]: Add xdg-dbus-proxy.
This commit is contained in:
Ricardo Wurmus 2020-05-11 17:17:07 +02:00
parent 5de2246f40
commit ac68fb3b29
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 64 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
gnu/packages/package-management.scm
View file

@ -65,6 +65,7 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages lisp)
#:use-module (gnu packages man)
#:use-module (gnu packages nettle)
#:use-module (gnu packages networking)
#:use-module (gnu packages nss)
#:use-module (gnu packages patchutils)
#:use-module (gnu packages perl)
@ -1113,7 +1114,7 @@ (define-public libostree
(define-public flatpak
(package
(name "flatpak")
(version "1.4.3")
(version "1.6.3")
(source
(origin
(method url-fetch)
@ -1121,32 +1122,64 @@ (define-public flatpak
version "/flatpak-" version ".tar.xz"))
(sha256
(base32
"11bfxmv8pxlb5x0lb2rsl45615fzfvq5r6wldf0l6ab2ngryd7i7"))))
"17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji"))))
;; 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
'(#:tests? #f ;; Tests fail due to trying to create files where it can't.
#:configure-flags (list
'(#:configure-flags
(list
"--enable-documentation=no" ;; FIXME
"--enable-system-helper=no"
"--localstatedir=/var"
(string-append "--with-system-bubblewrap="
(assoc-ref %build-inputs "bubblewrap")
"/bin/bwrap"))))
(native-inputs `(("bison" ,bison)
"/bin/bwrap")
"--with-system-dbus-proxy")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-tests
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively
(string-append (assoc-ref inputs "glibc-utf8-locales")
"/lib/locale/") "/tmp/locale")
(for-each make-file-writable (find-files "/tmp"))
(substitute* "tests/make-test-runtime.sh"
(("cp `which.*") "echo guix\n")
(("cp -r /usr/lib/locale/C\\.\\*")
(string-append "mkdir ${DIR}/usr/lib/locale/en_US; \
cp -r /tmp/locale/*/en_US.*")))
(substitute* "tests/libtest.sh"
(("/bin/kill") (which "kill"))
(("/usr/bin/python3") (which "python3")))
#t))
;; Many tests fail for unknown reasons, so we just run a few basic
;; tests
(replace 'check
(lambda _
(setenv "HOME" "/tmp")
(invoke "make" "check"
"TESTS=tests/test-basic.sh tests/test-config.sh testcommon"))))))
(native-inputs
`(("bison" ,bison)
("dbus" ,dbus) ; for dbus-daemon
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codegen
("glibc-utf8-locales" ,glibc-utf8-locales)
("gobject-introspection" ,gobject-introspection)
("libcap" ,libcap)
("pkg-config" ,pkg-config)))
("pkg-config" ,pkg-config)
("python" ,python)
("socat" ,socat)
("which" ,which)))
(propagated-inputs `(("glib-networking" ,glib-networking)
("gnupg" ,gnupg)
("gsettings-desktop-schemas"
,gsettings-desktop-schemas)))
(inputs `(("appstream-glib" ,appstream-glib)
(inputs
`(("appstream-glib" ,appstream-glib)
("bubblewrap" ,bubblewrap)
("dconf" ,dconf)
("fuse" ,fuse)
@ -1159,7 +1192,8 @@ (define-public flatpak
("libsoup" ,libsoup)
("libxau" ,libxau)
("libxml2" ,libxml2)
("util-linux" ,util-linux)))
("util-linux" ,util-linux)
("xdg-dbus-proxy" ,xdg-dbus-proxy)))
(home-page "https://flatpak.org")
(synopsis "System for building, distributing, and running sandboxed desktop
applications")