Unverified Commit 66ac96a8 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #207579 from bobby285271/cinnamon 

cinnamon: Fix settings theme thumbnail path + Fix crash with virtual keyboard in screensaver
parents 80956ccc 0ac48ac9

pkgs/desktops/cinnamon/cinnamon-common/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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" \

pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -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";