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.

Sign up for GitHub

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

Jump to bottom

nixos.display-manager: set DesktopNames from a new attribute #83637

Merged
merged 2 commits into from Mar 29, 2020
Merged

nixos.display-manager: set DesktopNames from a new attribute #83637

merged 2 commits into from Mar 29, 2020

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Mar 29, 2020

Motivation for this change

Currently some xsession desktop files are generated automatically in NixOS for some desktop environments. In those desktop files the session name is being used also as the value for the DesktopNames key, which does not always work.

This PR adds a new attribute services.xserver.desktopManager.session.desktopNames and uses it for the value of the DesktopNames key in the xsession desktop file.

Fixes #82571.

See also #83589.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@romildo romildo changed the title Desktop manager.desktop names nixos.display-manager: set DesktopNames from a new attribute Mar 29, 2020
@romildo romildo mentioned this pull request Mar 29, 2020
Closed
10 tasks
@worldofpeace
Copy link
Contributor

@GrahamcOfBorg test xfce

@worldofpeace
Copy link
Contributor

This change is safe for backport right?

@jtojnar
Copy link
Contributor

jtojnar commented Mar 29, 2020

Yup, should be safe.

@worldofpeace
Copy link
Contributor

Verified on this branch that I could see the settings #82571 in xfce

@worldofpeace worldofpeace merged commit bedf130 into NixOS:master Mar 29, 2020
@worldofpeace
Copy link
Contributor

backports to 20.03 9108778 83b7dde.

Might need to have some actual tests eventually for this stuff.

@romildo romildo deleted the desktopManager.desktopNames branch March 29, 2020 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@hedning hedning Awaiting requested review from hedning

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: xfce The Xfce Desktop Environment 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

xfce, mate: preferences not shown in menu
3 participants
@romildo @worldofpeace @jtojnar