From 1175a030a11364052d3d8bd6d1fbeb16b21e0d14 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 31 Jul 2024 21:12:49 +0800 Subject: [PATCH 1/3] xfce.thunar: Add exo to PATH Thunar assumes exo-desktop-item-edit and exo-open are available and does not provide fallback when they are missing, so just pass exo to the wrapper. Fixes https://github.com/NixOS/nixpkgs/issues/329688. --- pkgs/desktops/xfce/core/thunar/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 91e2ddb01c8a..0bd778798aee 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -60,6 +60,13 @@ let unwrapped = mkXfceDerivation { sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c ''; + preFixup = '' + gappsWrapperArgs+=( + # https://github.com/NixOS/nixpkgs/issues/329688 + --prefix PATH : ${lib.makeBinPath [ exo ]} + ) + ''; + meta = with lib; { description = "Xfce file manager"; mainProgram = "thunar"; From ca36d45b9535c5c98369a415fe30a1bd1815b380 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 31 Jul 2024 13:57:29 +0000 Subject: [PATCH 2/3] xfce.xfce4-screenshooter: 1.11.0 -> 1.11.1 https://gitlab.xfce.org/apps/xfce4-screenshooter/-/compare/xfce4-screenshooter-1.11.0...xfce4-screenshooter-1.11.1 --- .../xfce/applications/xfce4-screenshooter/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index d26723aefdfd..675e2b6891b4 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -7,7 +7,6 @@ , libXext , libXfixes , libXtst -, libxml2 , libxfce4ui , libxfce4util , wayland @@ -23,10 +22,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.11.0"; + version = "1.11.1"; odd-unstable = false; - sha256 = "sha256-DMLGaDHmwDDHvOMev/QKvmDr6AQ6Qnzxf3YCbf0/nXg="; + sha256 = "sha256-/N79YK233k9rVg5fGr27b8AZD9bCXllNQvrN4ghir/M="; nativeBuildInputs = [ wayland-scanner @@ -39,7 +38,6 @@ mkXfceDerivation { libXext libXfixes libXtst - libxml2 libxfce4ui libxfce4util wayland From 99900e157c395628cea80b1b6daa83cdf3559863 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 31 Jul 2024 14:00:44 +0000 Subject: [PATCH 3/3] xfce.thunar: 4.18.10 -> 4.18.11 https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.18.10...thunar-4.18.11 --- pkgs/desktops/xfce/core/thunar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 0bd778798aee..e7c5c30089c2 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -23,9 +23,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.10"; + version = "4.18.11"; - sha256 = "sha256-jne+jETPmM6VksdwJAxruji/GKH42iftWm74Ok9qX44="; + sha256 = "sha256-B417gkrU9EG4ZsEdeuH8P2v4FqYUiTwqgKcO4cSi4SI="; nativeBuildInputs = [ docbook_xsl