Merge pull request #104627 from andresilva/fix-thunar-plugins

thunar: fix wrapper build
This commit is contained in:
Timo Kaufmann 2020-12-03 23:21:23 +01:00 committed by GitHub
commit d652ba33b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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