diff options
| author | kiasoc5 <kiasoc5@tutanota.com> | 2022-01-14 17:05:19 -0500 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2022-01-20 14:48:16 +0100 |
| commit | 382800fbf0b9b9cb6697ed4afb936cfaa63dcec2 (patch) | |
| tree | e5cc8cf1dc78c30050f0caf94e137dc9dc1da5d1 /gnu/packages/package-management.scm | |
| parent | 58baee6e0dbeab68d911e437aab30fd228e6ce5d (diff) | |
| download | guix-patches-382800fbf0b9b9cb6697ed4afb936cfaa63dcec2.tar guix-patches-382800fbf0b9b9cb6697ed4afb936cfaa63dcec2.tar.gz | |
gnu: flatpak: Simplify inputs.
* gnu/packages/package-management.scm (flatpak)[native-inputs, inputs]: Remove labels.
[arguments]<#:phases>: Edit 'p11-kit-fix not to relying on labels.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fb4226805e..c8dd3e8f8a 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1808,8 +1808,7 @@ cp -r /tmp/locale/*/en_US.*"))) #t)) (add-after 'unpack 'p11-kit-fix (lambda* (#:key inputs #:allow-other-keys) - (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next") - "/bin/p11-kit"))) + (let ((p11-path (search-input-file inputs "/bin/p11-kit"))) (substitute* "session-helper/flatpak-session-helper.c" (("\"p11-kit\",") (string-append "\"" p11-path "\",")) @@ -1823,37 +1822,37 @@ cp -r /tmp/locale/*/en_US.*"))) (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) - ("python" ,python) - ("python-pyparsing" ,python-pyparsing) - ("socat" ,socat) - ("which" ,which))) - (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas)) + (native-inputs + (list bison + dbus ; for dbus-daemon + gettext-minimal + `(,glib "bin") ; for glib-mkenums + gdbus-codegen + glibc-utf8-locales + gobject-introspection + libcap + pkg-config + python + python-pyparsing + socat + which)) (inputs - `(("appstream-glib" ,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" ,libsoup-minimal-2) - ("libxau" ,libxau) - ("libxml2" ,libxml2) - ("p11-kit-next" ,p11-kit-next) - ("util-linux" ,util-linux) - ("xdg-dbus-proxy" ,xdg-dbus-proxy))) + (list appstream-glib + bubblewrap + dconf + fuse + gdk-pixbuf + gpgme + json-glib + libarchive + libostree + libseccomp + libsoup-minimal-2 + libxau + libxml2 + p11-kit-next + util-linux + xdg-dbus-proxy)) + (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas)) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop applications") |