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-managers: install sessionData.desktops #100112

Merged
merged 1 commit into from Oct 9, 2020
Merged

nixos/display-managers: install sessionData.desktops #100112

merged 1 commit into from Oct 9, 2020

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Fixes #100108
Screenshot from 2020-10-09 17-44-58

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.

@worldofpeace worldofpeace added this to In progress in 20.09 Blockers via automation Oct 9, 2020
@worldofpeace worldofpeace added this to the 20.09 milestone Oct 9, 2020
@jtojnar
Copy link
Contributor

jtojnar commented Oct 9, 2020

Just to make sure, does the button persist after running imports.misc.systemActions.getDefault()._updateLogout() in looking glass?

@worldofpeace
Copy link
Contributor Author

Just to make sure, does the button persist after running imports.misc.systemActions.getDefault()._updateLogout() in looking glass?

Will try in the vm.

@worldofpeace worldofpeace changed the title nixos/gnome3: fix showing logout button nixos/display-managers: install sessionData.desktops Oct 9, 2020
@worldofpeace
Copy link
Contributor Author

So I tried dropping setting XDG_DATA_DIRS in the gdm.nix, but it doesn't find any sessions. I'm not sure why that is, though. Maybe it's because it's a system service so it has the very minimal environment?

@ofborg ofborg bot removed the 6.topic: GNOME GNOME desktop environment and its underlying platform label Oct 9, 2020
@worldofpeace
Copy link
Contributor Author

Just to make sure, does the button persist after running imports.misc.systemActions.getDefault()._updateLogout() in looking glass?

This works 👍

20.09 Blockers automation moved this from In progress to Reviewer approved Oct 9, 2020
@worldofpeace worldofpeace merged commit 7a2eccf into NixOS:master Oct 9, 2020
20.09 Blockers automation moved this from Reviewer approved to Done Oct 9, 2020
@worldofpeace worldofpeace deleted the fix-gnome-logout-multisession branch October 9, 2020 23:31
@worldofpeace
Copy link
Contributor Author

backported to 20.09 in 3cd2b59.
and 20.03 in d74573d

@worldofpeace worldofpeace added the 8.has: port to stable A PR already has a backport to the stable release. label Oct 9, 2020
@worldofpeace
Copy link
Contributor Author

I did 20.03 just because it looks like a safe bugfix. I have no idea if this was in issue in 20.03, though.

@jtojnar
Copy link
Contributor

jtojnar commented Oct 15, 2020 •
edited

It created infinite recursion when using LXQt, since lxqt module uses config.system.path in services.xserver.desktopManager.session. config.system.path is a buildEnv that depends on environment.systemPackages.

We either cannot install the sessions environment.systemPackages or must forbid sessions from depending on config.system.path. The latter does not really sound reasonable so I guess the only solution would be to add the sessions to XDG_DATA_DIRS explicitly.

Reverted in 2a4607f (master), 9ca3b74 (release-20.09) and 8fa9a8a (release-20.03).

@jtojnar jtojnar mentioned this pull request Oct 19, 2020
Closed
worldofpeace added a commit to worldofpeace/nixpkgs that referenced this pull request Oct 21, 2020
@worldofpeace
nixos/display-managers: add sessionData.desktops to XDG_DATA_DIRS
755ba17 
Fixes NixOS#100108

Alternative to NixOS#100112 which doesn't break stuff.
@worldofpeace worldofpeace mentioned this pull request Oct 21, 2020
Merged
10 tasks
worldofpeace added a commit that referenced this pull request Oct 23, 2020
@worldofpeace
nixos/display-managers: add sessionData.desktops to XDG_DATA_DIRS
fadb52f 
Fixes #100108

Alternative to #100112 which doesn't break stuff.

(cherry picked from commit 755ba17)
marcus7070 pushed a commit to marcus7070/nixpkgs that referenced this pull request Nov 22, 2020
@worldofpeace @marcus7070
nixos/display-managers: add sessionData.desktops to XDG_DATA_DIRS
765eeac 
Fixes NixOS#100108

Alternative to NixOS#100112 which doesn't break stuff.
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

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
No open projects
20.09 Blockers
  
Done
Milestone
20.09
Development

Successfully merging this pull request may close these issues.

gnome3 logout button doesn't show
2 participants
@worldofpeace @jtojnar