diff options
author | Bobby Rong <rjl931189261@126.com> | 2022-12-25 10:11:56 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-25 10:11:56 +0800 |
commit | 66ac96a8745b7c407587a042e5728d21507a3e7b (patch) | |
tree | fa6a0da8a3e425b3dd5e9807dd4642cd9e161659 /pkgs/desktops | |
parent | 80956ccc99925e4f356188b73e3e6ad4fc2301bf (diff) | |
parent | 0ac48ac9327cd30cbb2c9301806df409c5d6e4b8 (diff) | |
download | nixlib-66ac96a8745b7c407587a042e5728d21507a3e7b.tar nixlib-66ac96a8745b7c407587a042e5728d21507a3e7b.tar.gz nixlib-66ac96a8745b7c407587a042e5728d21507a3e7b.tar.bz2 nixlib-66ac96a8745b7c407587a042e5728d21507a3e7b.tar.lz nixlib-66ac96a8745b7c407587a042e5728d21507a3e7b.tar.xz nixlib-66ac96a8745b7c407587a042e5728d21507a3e7b.tar.zst nixlib-66ac96a8745b7c407587a042e5728d21507a3e7b.zip |
Merge pull request #207579 from bobby285271/cinnamon
cinnamon: Fix settings theme thumbnail path + Fix crash with virtual keyboard in screensaver
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 99df41605326..c0c63675cb50 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -151,6 +151,8 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py + sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py + 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-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index dca6169b0da5..981b6a5d4578 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -93,6 +93,13 @@ stdenv.mkDerivation rec { sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py ''; + preFixup = '' + # https://github.com/NixOS/nixpkgs/issues/101881 + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" + ) + ''; + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-screensaver"; description = "The Cinnamon screen locker and screensaver program"; |