Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 9 insertions, 2 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix
index cc44e6624571..b0b4268db6ec 100644
--- a/infra/libkookie/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix
+++ b/infra/libkookie/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix
@@ -14,7 +14,14 @@ symlinkJoin {
     wrapProgram "$out/bin/thunar-settings" \
       --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
 
-    for file in "lib/systemd/user/thunar.service" "share/dbus-1/services/org.xfce.FileManager.service" \
+    # NOTE: we need to remove the folder symlink itself and create
+    # a new folder before trying to substitute any file below.
+    rm -f "$out/lib/systemd/user"
+    mkdir -p "$out/lib/systemd/user"
+
+    # point to wrapped binary in all service files
+    for file in "lib/systemd/user/thunar.service" \
+      "share/dbus-1/services/org.xfce.FileManager.service" \
       "share/dbus-1/services/org.xfce.Thunar.FileManager1.service" \
       "share/dbus-1/services/org.xfce.Thunar.service"
     do
@@ -24,7 +31,7 @@ symlinkJoin {
     done
   '';
 
-   meta = with lib; {
+  meta = with lib; {
     inherit (thunar.meta) homepage license platforms maintainers;
 
     description = thunar.meta.description + optionalString