movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

xdg-desktop-portal: 1.20.0 -> 1.20.3

Browse source 
Changes:
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.1
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.2
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.3
This commit is contained in:
Sergei Trofimovich 2025-05-22 21:17:31 +01:00
parent 34fc0d11eb
commit 1b2f0d579d
4 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/xdg-desktop-portal/default.nix
View file

@ -34,7 +34,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "xdg-desktop-portal"; pname = "xdg-desktop-portal";
version = "1.20.0"; version = "1.20.3";
outputs = [ outputs = [
"out" "out"
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "flatpak"; owner = "flatpak";
repo = "xdg-desktop-portal"; repo = "xdg-desktop-portal";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-FHMa8fTr8qNEM5WptuMjMs/XOsvmFxi8pDaCrwJ3/ww="; hash = "sha256-ntTGEsk8GlXkp3i9RtF+T7jqnNdL2GVbu05d68WVTYc=";
}; };
patches = [ patches = [

8
pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
View file

@ -1,5 +1,3 @@
diff --git a/src/validate-icon.c b/src/validate-icon.c
index c42265b..320f028 100644
--- a/src/validate-icon.c --- a/src/validate-icon.c
+++ b/src/validate-icon.c +++ b/src/validate-icon.c
@@ -254,7 +254,7 @@ flatpak_get_bwrap (void) @@ -254,7 +254,7 @@ flatpak_get_bwrap (void)
@ -12,9 +10,9 @@ index c42265b..320f028 100644
g_autofree char* arg_input_fd = NULL; g_autofree char* arg_input_fd = NULL;
char validate_icon[PATH_MAX + 1]; char validate_icon[PATH_MAX + 1];
@@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd) @@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd)
"--unshare-ipc", "--tmpfs", "/tmp",
"--unshare-net", "--proc", "/proc",
"--unshare-pid", "--dev", "/dev",
- "--ro-bind", "/usr", "/usr", - "--ro-bind", "/usr", "/usr",
- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", - "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
+ "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "@storeDir@", "@storeDir@",

8
pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
View file

@ -1,5 +1,3 @@
diff --git a/src/validate-sound.c b/src/validate-sound.c
index 7348d46..8b87c78 100644
--- a/src/validate-sound.c --- a/src/validate-sound.c
+++ b/src/validate-sound.c +++ b/src/validate-sound.c
@@ -234,7 +234,7 @@ flatpak_get_bwrap (void) @@ -234,7 +234,7 @@ flatpak_get_bwrap (void)
@ -12,9 +10,9 @@ index 7348d46..8b87c78 100644
g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free); g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
char validate_sound[PATH_MAX + 1]; char validate_sound[PATH_MAX + 1];
@@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd) @@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd)
"--unshare-ipc", "--tmpfs", "/tmp",
"--unshare-net", "--proc", "/proc",
"--unshare-pid", "--dev", "/dev",
- "--ro-bind", "/usr", "/usr", - "--ro-bind", "/usr", "/usr",
- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", - "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
+ "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "@storeDir@", "@storeDir@",

6
pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
View file

@ -1,5 +1,3 @@
diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c
index 770c265..a34ca8e 100644
--- a/src/xdp-portal-impl.c --- a/src/xdp-portal-impl.c
+++ b/src/xdp-portal-impl.c +++ b/src/xdp-portal-impl.c
@@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose) @@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose)
@ -8,6 +6,6 @@ index 770c265..a34ca8e 100644
portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR");
+ if (portal_dir == NULL) + if (portal_dir == NULL)
+ portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR"); + portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR");
if (portal_dir == NULL) if (portal_dir != NULL)
portal_dir = DATADIR "/xdg-desktop-portal/portals"; {