about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-06-04 17:38:12 +0800
committerBobby Rong <rjl931189261@126.com>2023-06-08 19:24:01 +0800
commit924193b5e31f19d58207c1e07a38ed30d43ecd92 (patch)
treec3b804d530ee66b03b5389016770b30fb631cf0f /pkgs/desktops
parent7409480d5c8584a1a83c422530419efe4afb0d19 (diff)
downloadnixlib-924193b5e31f19d58207c1e07a38ed30d43ecd92.tar
nixlib-924193b5e31f19d58207c1e07a38ed30d43ecd92.tar.gz
nixlib-924193b5e31f19d58207c1e07a38ed30d43ecd92.tar.bz2
nixlib-924193b5e31f19d58207c1e07a38ed30d43ecd92.tar.lz
nixlib-924193b5e31f19d58207c1e07a38ed30d43ecd92.tar.xz
nixlib-924193b5e31f19d58207c1e07a38ed30d43ecd92.tar.zst
nixlib-924193b5e31f19d58207c1e07a38ed30d43ecd92.zip
cinnamon.cinnamon-common: fix all hardcode absolute paths in applets
This will be helpful to the a11y and the printer applet.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-common/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index e50e14ea8d94..54971c332ca1 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -155,13 +155,15 @@ stdenv.mkDerivation rec {
       -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
       {} +
 
+    # All optional and may introduce circular dependency.
+    find ./files/usr/share/cinnamon/applets -type f -exec sed -i \
+      -e '/^#/!s,/usr/bin,/run/current-system/sw/bin,g' \
+      {} +
+
     sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
 
     sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py
 
-    sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
-      -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
-
     sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
 
     sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py