Merge pull request #331301 from bobby285271/upd/xfce

Xfce updates 2024-07-31
This commit is contained in:
Bobby Rong 2024-08-01 19:58:54 +08:00 committed by GitHub
commit 6212d8033f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions

View File

@ -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

View File

@ -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
@ -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";