b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #207579 from bobby285271/cinnamon

Browse source 
cinnamon: Fix settings theme thumbnail path + Fix crash with virtual keyboard in screensaver
This commit is contained in:
Bobby Rong 2022-12-25 10:11:56 +08:00 committed by GitHub
parent 80956ccc99 0ac48ac932
commit 66ac96a874
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file

@ -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" \

7
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View file

@ -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";