diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix index cc44e6624571..b0b4268db6ec 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/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 |