summary refs log tree commit diff
path: root/pkgs/tools/X11
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2023-03-04 00:39:34 +0000
committerGitHub <noreply@github.com>2023-03-04 00:39:34 +0000
commitf3b63ce3c3578638113c4bcbdd291eb358f823bd (patch)
tree4d1bc82fd1c2e5a28c7ede0fd0a836deae36d2d6 /pkgs/tools/X11
parent841527059c7e07f331da8dc96bace1fd4ffcb85a (diff)
parentb1849a18cf6daa98f0f10860dfd66da2a2f591fb (diff)
downloadnixpkgs-f3b63ce3c3578638113c4bcbdd291eb358f823bd.tar
nixpkgs-f3b63ce3c3578638113c4bcbdd291eb358f823bd.tar.gz
nixpkgs-f3b63ce3c3578638113c4bcbdd291eb358f823bd.tar.bz2
nixpkgs-f3b63ce3c3578638113c4bcbdd291eb358f823bd.tar.lz
nixpkgs-f3b63ce3c3578638113c4bcbdd291eb358f823bd.tar.xz
nixpkgs-f3b63ce3c3578638113c4bcbdd291eb358f823bd.tar.zst
nixpkgs-f3b63ce3c3578638113c4bcbdd291eb358f823bd.zip
Merge pull request #217590 from lilyinstarlight/fix/xdg-open-files-with-portal
xdg-utils: patch xdg-open to correctly open files when using portal
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r--pkgs/tools/X11/xdg-utils/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 53a43dde303..c3b1dd546fb 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, fetchFromGitHub
+{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, fetchpatch
 , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
 , w3m, gnugrep, gnused, coreutils, xset, perlPackages
 , mimiSupport ? false, gawk
@@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
     # Allow forcing the use of XDG portals using NIXOS_XDG_OPEN_USE_PORTAL environment variable.
     # Upstream PR: https://github.com/freedesktop/xdg-utils/pull/12
     ./allow-forcing-portal-use.patch
+    # Allow opening files when using portal with xdg-open.
+    # Upstream PR: https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/65
+    (fetchpatch {
+      name = "support-openfile-with-portal.patch";
+      url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/5cd8c38f58d9db03240f4bc67267fe3853b66ec7.diff";
+      hash = "sha256-snkhxwGF9hpqEh5NGG8xixTi/ydAk5apXRtgYrVgNY8=";
+    })
   ];
 
   # just needed when built from git