mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-10 05:31:21 +01:00
gnu: flatpak: Use G-expressions.
* gnu/packages/package-management.scm (flatpak): Fix indentation. [arguments]: Use G-expressions. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Zhu Zihao
Ludovic Courtès
parent
882cacc1bb
commit
b01622f57d
1 changed files with 92 additions and 91 deletions
|
|
@ -1798,103 +1798,104 @@ the boot loader configuration.")
|
||||||
|
|
||||||
(define-public flatpak
|
(define-public flatpak
|
||||||
(package
|
(package
|
||||||
(name "flatpak")
|
(name "flatpak")
|
||||||
(version "1.12.7")
|
(version "1.12.7")
|
||||||
(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 "05lkpbjiwp69q924i1jfyk5frcqbdbv9kyzbqwm2hy723i9jmdbd"))
|
(base32 "05lkpbjiwp69q924i1jfyk5frcqbdbv9kyzbqwm2hy723i9jmdbd"))
|
||||||
(patches (search-patches "flatpak-fix-path.patch"))))
|
(patches (search-patches "flatpak-fix-path.patch"))))
|
||||||
|
|
||||||
;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
|
;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
|
||||||
;; find the TLS backend in glib-networking.
|
;; find the TLS backend in glib-networking.
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system glib-or-gtk-build-system)
|
||||||
|
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags
|
(list
|
||||||
(list
|
#:configure-flags
|
||||||
"--enable-documentation=no" ;; FIXME
|
#~(list
|
||||||
"--enable-system-helper=no"
|
"--enable-documentation=no" ;; FIXME
|
||||||
"--localstatedir=/var"
|
"--enable-system-helper=no"
|
||||||
(string-append "--with-system-bubblewrap="
|
"--localstatedir=/var"
|
||||||
(assoc-ref %build-inputs "bubblewrap")
|
(string-append "--with-system-bubblewrap="
|
||||||
"/bin/bwrap")
|
(assoc-ref %build-inputs "bubblewrap")
|
||||||
(string-append "--with-system-dbus-proxy="
|
"/bin/bwrap")
|
||||||
(assoc-ref %build-inputs "xdg-dbus-proxy")
|
(string-append "--with-system-dbus-proxy="
|
||||||
"/bin/xdg-dbus-proxy"))
|
(assoc-ref %build-inputs "xdg-dbus-proxy")
|
||||||
|
"/bin/xdg-dbus-proxy"))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(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
|
||||||
(search-input-directory inputs "lib/locale")
|
(search-input-directory inputs "lib/locale")
|
||||||
"/tmp/locale")
|
"/tmp/locale")
|
||||||
(for-each make-file-writable (find-files "/tmp"))
|
(for-each make-file-writable (find-files "/tmp"))
|
||||||
(substitute* "tests/make-test-runtime.sh"
|
(substitute* "tests/make-test-runtime.sh"
|
||||||
(("cp `which.*") "echo guix\n")
|
(("cp `which.*") "echo guix\n")
|
||||||
(("cp -r /usr/lib/locale/C\\.\\*")
|
(("cp -r /usr/lib/locale/C\\.\\*")
|
||||||
(string-append "mkdir ${DIR}/usr/lib/locale/en_US; \
|
(string-append "mkdir ${DIR}/usr/lib/locale/en_US; \
|
||||||
cp -r /tmp/locale/*/en_US.*")))
|
cp -r /tmp/locale/*/en_US.*")))
|
||||||
(substitute* "tests/libtest.sh"
|
(substitute* "tests/libtest.sh"
|
||||||
(("/bin/kill") (which "kill"))
|
(("/bin/kill") (which "kill"))
|
||||||
(("/usr/bin/python3") (which "python3")))
|
(("/usr/bin/python3") (which "python3")))
|
||||||
#t))
|
#t))
|
||||||
(add-after 'unpack 'p11-kit-fix
|
(add-after 'unpack 'p11-kit-fix
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(let ((p11-path (search-input-file inputs "/bin/p11-kit")))
|
(let ((p11-path (search-input-file inputs "/bin/p11-kit")))
|
||||||
(substitute* "session-helper/flatpak-session-helper.c"
|
(substitute* "session-helper/flatpak-session-helper.c"
|
||||||
(("\"p11-kit\",")
|
(("\"p11-kit\",")
|
||||||
(string-append "\"" p11-path "\","))
|
(string-append "\"" p11-path "\","))
|
||||||
(("if \\(g_find_program_in_path \\(\"p11-kit\"\\)\\)")
|
(("if \\(g_find_program_in_path \\(\"p11-kit\"\\)\\)")
|
||||||
(string-append "if (g_find_program_in_path (\""
|
(string-append "if (g_find_program_in_path (\""
|
||||||
p11-path "\"))"))))))
|
p11-path "\"))"))))))
|
||||||
;; Many tests fail for unknown reasons, so we just run a few basic
|
;; Many tests fail for unknown reasons, so we just run a few basic
|
||||||
;; tests.
|
;; tests.
|
||||||
(replace 'check
|
(replace 'check
|
||||||
(lambda _
|
(lambda _
|
||||||
(setenv "HOME" "/tmp")
|
(setenv "HOME" "/tmp")
|
||||||
(invoke "make" "check"
|
(invoke "make" "check"
|
||||||
"TESTS=tests/test-basic.sh tests/test-config.sh testcommon"))))))
|
"TESTS=tests/test-basic.sh tests/test-config.sh testcommon"))))))
|
||||||
(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
|
||||||
glibc-utf8-locales
|
glibc-utf8-locales
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
libcap
|
libcap
|
||||||
pkg-config
|
pkg-config
|
||||||
python
|
python
|
||||||
python-pyparsing
|
python-pyparsing
|
||||||
socat
|
socat
|
||||||
which))
|
which))
|
||||||
(inputs
|
(inputs
|
||||||
(list appstream-glib
|
(list appstream-glib
|
||||||
bubblewrap
|
bubblewrap
|
||||||
dconf
|
dconf
|
||||||
fuse
|
fuse
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
gpgme
|
gpgme
|
||||||
json-glib
|
json-glib
|
||||||
libarchive
|
libarchive
|
||||||
libostree
|
libostree
|
||||||
libseccomp
|
libseccomp
|
||||||
libsoup-minimal-2
|
libsoup-minimal-2
|
||||||
libxau
|
libxau
|
||||||
libxml2
|
libxml2
|
||||||
p11-kit-next
|
p11-kit-next
|
||||||
util-linux
|
util-linux
|
||||||
xdg-dbus-proxy))
|
xdg-dbus-proxy))
|
||||||
(propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas))
|
(propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas))
|
||||||
(home-page "https://flatpak.org")
|
(home-page "https://flatpak.org")
|
||||||
(synopsis "System for building, distributing, and running sandboxed desktop
|
(synopsis "System for building, distributing, and running sandboxed desktop
|
||||||
applications")
|
applications")
|
||||||
(description "Flatpak is a system for building, distributing, and running
|
(description "Flatpak is a system for building, distributing, and running
|
||||||
sandboxed desktop applications on GNU/Linux.")
|
sandboxed desktop applications on GNU/Linux.")
|
||||||
(license license:lgpl2.1+)))
|
(license license:lgpl2.1+)))
|
||||||
|
|
||||||
(define-public akku
|
(define-public akku
|
||||||
(package
|
(package
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue