Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cinnamon: Fix settings theme thumbnail path + Fix crash with virtual keyboard in screensaver #207579

Merged
merged 2 commits into from
Dec 25, 2022

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Dec 24, 2022

Description of changes

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.

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.

/cc #101881

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

We look for globally installed themes with this path, so we use
/run/current-system/sw/share.
Caribou.KeyboardModel is also used here, so we apply the same fix for
cinnamon-common to get rid of a crash.
@github-actions github-actions bot added the 6.topic: cinnamon Desktop environment label Dec 24, 2022
@bobby285271
Copy link
Member Author

bobby285271 commented Dec 24, 2022

(nixosTests.cinnamon does not build on master currently, this PR will fix that)
@ofborg test cinnamon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cinnamon Desktop environment 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant