From f2a0dc5399da4388068d615244ca9ac0e07c5516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 26 Nov 2024 07:44:37 -0300
Subject: [PATCH] lxqt.lxqt-wayland-session: 0.1.0 -> 0.1.1

Diff: https://github.com/lxqt/lxqt-wayland-session/compare/0.1.0...0.1.1
---
 .../lxqt/lxqt-wayland-session/default.nix         | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index 21f4ef2548d9..430cde7762c5 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -4,12 +4,15 @@
   fetchFromGitHub,
   cmake,
   kwindowsystem,
+  layer-shell-qt,
   liblxqt,
   libqtxdg,
   lxqt-build-tools,
+  lxqt-session,
   pkg-config,
   qtsvg,
   qttools,
+  qtxdg-tools,
   xdg-user-dirs,
   xkeyboard_config,
   gitUpdater,
@@ -17,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-wayland-session";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-wayland-session";
     rev = version;
-    hash = "sha256-5WdfwJ89HWlXL6y9Lpgs7H3mbN/wbf+9VbP9ERPasBM=";
+    hash = "sha256-UMlV8LqUXM2+3ZSLj30FFgC+ZVPmt2W8uE2RrZKqCJE=";
   };
 
   nativeBuildInputs = [
@@ -35,15 +38,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     kwindowsystem
+    layer-shell-qt # for applications that need layer-shell-qt (ex: lxqt-panel)
     liblxqt
     libqtxdg
+    lxqt-session
     qtsvg
-    xdg-user-dirs
+    qtxdg-tools # allow to use xdg-utils under LXQt, similar to https://github.com/lxqt/lxqt-session/blob/2.0.0/CHANGELOG#L27
+    xdg-user-dirs # startlxqtwayland sets XDG_CURRENT_DESKTOP
   ];
 
   postPatch = ''
     substituteInPlace startlxqtwayland.in \
-      --replace-fail /usr/share/X11/xkb/rules ${xkeyboard_config}/share/X11/xkb/rules
+      --replace-fail /usr/share/X11/xkb/rules ${xkeyboard_config}/share/X11/xkb/rules \
+      --replace-fail "cp -av " "cp -av --no-preserve=mode "
 
     substituteInPlace configurations/{labwc/autostart,lxqt-hyprland.conf,lxqt-wayfire.ini} \
       --replace-fail /usr/share/lxqt/wallpapers $out/share/lxqt/wallpapers