about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-12-24 22:46:53 +0800
committerBobby Rong <rjl931189261@126.com>2022-12-24 23:03:12 +0800
commit0ac48ac9327cd30cbb2c9301806df409c5d6e4b8 (patch)
tree38e1fc29b8c43b095ab692762532ed9f55f919d5 /pkgs/desktops
parentd5510e9e9e3e9db3d35fea2af012c76d6af1c173 (diff)
downloadnixlib-0ac48ac9327cd30cbb2c9301806df409c5d6e4b8.tar
nixlib-0ac48ac9327cd30cbb2c9301806df409c5d6e4b8.tar.gz
nixlib-0ac48ac9327cd30cbb2c9301806df409c5d6e4b8.tar.bz2
nixlib-0ac48ac9327cd30cbb2c9301806df409c5d6e4b8.tar.lz
nixlib-0ac48ac9327cd30cbb2c9301806df409c5d6e4b8.tar.xz
nixlib-0ac48ac9327cd30cbb2c9301806df409c5d6e4b8.tar.zst
nixlib-0ac48ac9327cd30cbb2c9301806df409c5d6e4b8.zip
cinnamon.cinnamon-screensaver: Fix crash with virtual keyboard
Caribou.KeyboardModel is also used here, so we apply the same fix for
cinnamon-common to get rid of a crash.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix7
1 files changed, 7 insertions, 0 deletions
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";