diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-05-17 19:42:34 +0900 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-03-06 14:53:08 +0100 |
| commit | 7b4b9e531757f3850b519ff9bf0c4e95d44de2ac (patch) | |
| tree | ac429310eaa8e909813d69613fb18d9df34a1d63 | |
| parent | a2d0f215f21150122ec72c4e35bf038a234a2983 (diff) | |
gnu: xdg-desktop-portal-gtk: Improve package definition.
This is a follow-up to a17a5c02a8e3278c4bd0a326127d4043e663560e, which
inadvertently left old inputs and phases.
* gnu/packages/freedesktop.scm (xdg-desktop-portal-gtk)[arguments]:
Add #:glib-or-gtk?. Remove #:configure-flags and #:phases.
[native-inputs]: Remove autoconf, automake, libtool, libxml2 and which.
Drop labels.
[inputs]: Replace gtk+ with gtk. Drop labels.
Change-Id: Ifaa7092872884b74fd3f783b677449935bfd4a2a
| -rw-r--r-- | gnu/packages/freedesktop.scm | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e4a77e75e37..d8b08c6ca01 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3293,39 +3293,10 @@ and others.") (base32 "0drvlanj4pydcmq1fhk8nbj5mb2zpf2pxcqxd4g61a0r4hyp98s7")))) (build-system meson-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'po-chmod - (lambda _ - ;; Make sure 'msgmerge' can modify the PO files. - (for-each (lambda (po) - (chmod po #o666)) - (find-files "po" "\\.po$")) - #t))) - #:configure-flags - (list - "-Dappchooser=enabled" - "-Dwallpaper=enabled" - "-Dsettings=enabled" - "-Dlockdown=enabled"))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("libxml2" ,libxml2) - ("glib:bin" ,glib "bin") - ("which" ,which) - ("gettext" ,gettext-minimal))) - (inputs - `(("glib" ,glib) - ("gtk" ,gtk+) - ("fontconfig" ,fontconfig) - ("gnome-desktop" ,gnome-desktop) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) - (propagated-inputs - (list xdg-desktop-portal)) + (arguments (list #:glib-or-gtk? #t)) + (native-inputs (list gettext-minimal `(,glib "bin") pkg-config)) + (inputs (list glib gtk fontconfig gnome-desktop gsettings-desktop-schemas)) + (propagated-inputs (list xdg-desktop-portal)) (home-page "https://github.com/flatpak/xdg-desktop-portal-gtk") (synopsis "GTK implementation of xdg-desktop-portal") (description |