diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-10-08 10:20:07 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-10-08 10:20:07 +0200 |
commit | 6565abc264549742c9cddcb547506a2c245d6b2b (patch) | |
tree | 5e770f59e8665e8de346bcf41c41a353cd4e0f44 /pkgs/desktops/cinnamon/cinnamon-common | |
parent | bc2ce9630aa6d0dc28105becb260988136cd9ef6 (diff) | |
parent | b078ae79375573c7af1f7952db3eae5e337e6572 (diff) | |
download | nixpkgs-6565abc264549742c9cddcb547506a2c245d6b2b.tar nixpkgs-6565abc264549742c9cddcb547506a2c245d6b2b.tar.gz nixpkgs-6565abc264549742c9cddcb547506a2c245d6b2b.tar.bz2 nixpkgs-6565abc264549742c9cddcb547506a2c245d6b2b.tar.lz nixpkgs-6565abc264549742c9cddcb547506a2c245d6b2b.tar.xz nixpkgs-6565abc264549742c9cddcb547506a2c245d6b2b.tar.zst nixpkgs-6565abc264549742c9cddcb547506a2c245d6b2b.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/desktops/cinnamon/cinnamon-common')
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 69c687912e0..7ddcada83b5 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -153,6 +153,10 @@ stdenv.mkDerivation rec { sed "s|\"upload-system-info\"|\"${xapp}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings + + 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 + # this one really IS optional sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings |