diff options
author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/freedesktop.scm | |
parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/freedesktop.scm')
-rw-r--r-- | gnu/packages/freedesktop.scm | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 24e8544db7..5c76e6b8f0 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2297,7 +2297,7 @@ fallback to generic Systray support if none of those are available.") (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.7.2") + (version "1.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -2306,7 +2306,7 @@ fallback to generic Systray support if none of those are available.") (file-name (git-file-name name version)) (sha256 (base32 - "0rkwpsmbn3d3spkzc2zsd50l2r8pp4la390zcpsawaav8w7ql7xm")))) + "0pq0kmvzk56my396vh97pzw4wizwmlmzvv2kr2xv047x3044mr5n")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -2326,6 +2326,21 @@ fallback to generic Systray support if none of those are available.") ("geoclue" ,geoclue) ("pipewire" ,pipewire-0.3) ("fuse" ,fuse))) + (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))))) + (native-search-paths + (list (search-path-specification + (variable "XDG_DESKTOP_PORTAL_DIR") + (separator #f) + (files '("share/xdg-desktop-portal/portals"))))) (home-page "https://github.com/flatpak/xdg-desktop-portal") (synopsis "Desktop integration portal for sandboxed apps") (description @@ -2394,7 +2409,7 @@ interfaces.") (define-public xdg-desktop-portal-wlr (package (name "xdg-desktop-portal-wlr") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -2403,8 +2418,12 @@ interfaces.") (file-name (git-file-name name version)) (sha256 (base32 - "18nlkqqxgxh7k0r2nk867wnp2nmaiinl6z67lrfv7rmiym0x82p8")))) + "13fbzh8bjnhk4xs8j9bpc01q3hy27zpbf0gkk1fnh3hm5pnyfyiv")))) (build-system meson-build-system) + (arguments + `(#:configure-flags + '("-Dsystemd=disabled" + "-Dsd-bus-provider=libelogind"))) (native-inputs `(("cmake" ,cmake) ("pkg-config" ,pkg-config))) @@ -2412,6 +2431,7 @@ interfaces.") `(("elogind" ,elogind) ("iniparser" ,iniparser) ("pipewire" ,pipewire-0.3) + ("inih" ,libinih) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/emersion/xdg-desktop-portal-wlr") |