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

nixos/display-managers: add sessionData.desktops to XDG_DATA_DIRS #101274

Merged
merged 1 commit into from Oct 23, 2020

Conversation

worldofpeace
Copy link
Contributor

Fixes #100108

Alternative to #100112 which doesn't break stuff.

Motivation for this change
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 requested a review from a team October 21, 2020 19:28
@worldofpeace
Copy link
Contributor Author

I did start a vm and see the logout button. Didn't do the lookinglass thingy, though.

@worldofpeace worldofpeace added this to In progress in 20.09 Blockers via automation Oct 21, 2020
@worldofpeace worldofpeace added this to In Progress in GNOME Oct 21, 2020
20.09 Blockers automation moved this from In progress to Reviewer approved Oct 23, 2020
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed that it works using looking glass as showi in #84634 (comment).

@worldofpeace worldofpeace merged commit b44e329 into NixOS:master Oct 23, 2020
GNOME automation moved this from In Progress to Done Oct 23, 2020
20.09 Blockers automation moved this from Reviewer approved to Done Oct 23, 2020
@worldofpeace worldofpeace deleted the gnome-logout-button branch October 23, 2020 15:47
@worldofpeace
Copy link
Contributor Author

backported to 20.09 in fadb52f

rnhmjoj added a commit to rnhmjoj/nixpkgs that referenced this pull request Sep 22, 2021
Apparently setting a variable via `environment.variables` when the same
is already present in `environment.sessionVariables` (that is merged
into the former option) creates a conflict.

For reference: this started with the change in NixOS#101274.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
GNOME
  
Done
Development

Successfully merging this pull request may close these issues.

gnome3 logout button doesn't show
2 participants