From d5510e9e9e3e9db3d35fea2af012c76d6af1c173 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 24 Dec 2022 21:45:48 +0800 Subject: [PATCH 1/2] cinnamon.cinnamon-common: Fix settings theme thumbnail path We look for globally installed themes with this path, so we use /run/current-system/sw/share. --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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" \ From 0ac48ac9327cd30cbb2c9301806df409c5d6e4b8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 24 Dec 2022 22:46:53 +0800 Subject: [PATCH 2/2] 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. --- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) 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";