diff options
| author | Rodion Goritskov <rodion.goritskov@gmail.com> | 2024-10-10 00:34:56 +0400 |
|---|---|---|
| committer | Rodion Goritskov <rodion.goritskov@gmail.com> | 2024-10-10 00:34:56 +0400 |
| commit | 50efae93b9868b9b2b844b31050c55f19ec5a682 (patch) | |
| tree | ad4a6b75b9c92b9b93aac4aaf7da9e2fb887e0b9 /rodion/packages | |
| parent | 4fee0fc5137d2b5de26f07b232fcefd81b2c8d56 (diff) | |
gnu: Add xdg-desktop-portal-next/fixed.
* rodion/packages/freedesktop.scm (xdg-desktop-portal-next/fixed): New
variable.
* rodion/packages/patches/001-xdg-desktop-portal.patch: Add patch.
Diffstat (limited to 'rodion/packages')
| -rw-r--r-- | rodion/packages/freedesktop.scm | 15 | ||||
| -rw-r--r-- | rodion/packages/patches/001-xdg-desktop-portal.patch | 27 |
2 files changed, 42 insertions, 0 deletions
diff --git a/rodion/packages/freedesktop.scm b/rodion/packages/freedesktop.scm new file mode 100644 index 0000000..a6de0cd --- /dev/null +++ b/rodion/packages/freedesktop.scm @@ -0,0 +1,15 @@ +(define-module (rodion packages freedesktop) + #:use-module (gnu packages freedesktop) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (guix gexp)) + +;; xdg-desktop-portal newest version with configuration files reading fixes +(define-public xdg-desktop-portal-next/fixed + (package + (inherit xdg-desktop-portal-next) + (source (origin + (inherit (package-source xdg-desktop-portal-next)) + (patches (append + (origin-patches (package-source xdg-desktop-portal-next)) + `(,(local-file "./patches/001-xdg-desktop-portal.patch")))))))) diff --git a/rodion/packages/patches/001-xdg-desktop-portal.patch b/rodion/packages/patches/001-xdg-desktop-portal.patch new file mode 100644 index 0000000..eba07f8 --- /dev/null +++ b/rodion/packages/patches/001-xdg-desktop-portal.patch @@ -0,0 +1,27 @@ +From 37003d1f99246c88cbe7cf2f83616642e0fdf3fb Mon Sep 17 00:00:00 2001 +From: Rodion Goritskov <rodion.goritskov@gmail.com> +Date: Fri, 27 Sep 2024 00:44:07 +0400 +Subject: [PATCH] portal-impl: Check if there are any configuration files in XDG_DESKTOP_PORTAL_DIR before exiting configuration search + +--- + src/portal-impl.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/portal-impl.c b/src/portal-impl.c +index 8c1fd53..8708409 100644 +--- a/src/portal-impl.c ++++ b/src/portal-impl.c +@@ -438,9 +438,8 @@ load_portal_configuration (gboolean opt_verbose) + + if (portal_dir != NULL) + { +- load_config_directory (portal_dir, desktops, opt_verbose); +- /* All other config directories are ignored when this is set */ +- return; ++ if (load_config_directory (portal_dir, desktops, opt_verbose)) ++ return; + } + + /* $XDG_CONFIG_HOME/xdg-desktop-portal/(DESKTOP-)portals.conf */ +-- +2.46.0 |