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:47:07 +0800
committerBobby Rong <rjl931189261@126.com>2023-06-08 19:24:19 +0800
commitad888c99e5ca0521720f5e371b41dd8b86953706 (patch)
tree502dbd8edabdcdfe8799bb3fbb40e768f24a9c04 /pkgs/desktops
parent924193b5e31f19d58207c1e07a38ed30d43ecd92 (diff)
cinnamon.cinnamon-common: group and sort substitutions
This is a cosmetic change. I perfer working under the cinnamon-settings folder for more targeted result.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-common/default.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index 54971c332ca15..32248fe9832b1 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -160,17 +160,15 @@ stdenv.mkDerivation rec {
       -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/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
-
-    sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon  -i ./files/usr/bin/cinnamon-session-cinnamon2d
-
-    sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py
+    pushd ./files/usr/share/cinnamon/cinnamon-settings
+      sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./bin/capi.py
+      sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./bin/CinnamonGtkSettings.py
+      sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./bin/SettingsWidgets.py
+      sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./bin/Spices.py
+      sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./modules/cs_info.py
+    popd
+
+    sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}
 
     patchShebangs src/data-to-c.pl
   '';