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

gnome3.gdm: fix session chooser (backport to 18.03) #44449

Merged
merged 1 commit into from Aug 5, 2018
Merged

gnome3.gdm: fix session chooser (backport to 18.03) #44449

merged 1 commit into from Aug 5, 2018

Conversation

thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Aug 4, 2018 •
edited

Motivation for this change

Backport to 18.03 of fix in 300af66 for #34101.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@jtojnar @thefloweringash
gnome3.gdm: fix session chooser
c75ef82 
We are patching GDM to respect GDM_SESSIONS_DIR environment
variable, which we are setting in the GDM module. Previously, we
only took care of a single code path, the one that handled session
start-up; missing the one obtaining the list of sessions.

This commit patches the second code path, and also whitelists the
GDM_SESSIONS_DIR so that it can be passed to the greeter.

Fixes NixOS#34101
@GrahamcOfBorg GrahamcOfBorg added 6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 10.rebuild-linux: 11-100 labels Aug 4, 2018
@xeji
Copy link
Contributor

xeji commented Aug 4, 2018

cc @jtojnar

jtojnar
jtojnar approved these changes Aug 5, 2018
View reviewed changes
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.

Should probably work.

@xeji
Copy link
Contributor

xeji commented Aug 5, 2018

@GrahamcOfBorg build gnome3.gdm gnome3.gnome-shell

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: gnome3.gdm, gnome3.gnome-shell

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gnome3.gdm, gnome3.gnome-shell

Partial log (click to expand)

shrinking /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/bin/.gnome-shell-wrapped
shrinking /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/libexec/.gnome-shell-perf-helper-wrapped
shrinking /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/libexec/.gnome-shell-portal-helper-wrapped
shrinking /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/libexec/.gnome-shell-calendar-server-wrapped
shrinking /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/libexec/.gnome-shell-hotplug-sniffer-wrapped
gzipping man pages under /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/share/man/
strip is /nix/store/k8b9hqv58dd1z0j4ikak24ykndcm91s6-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/lib  /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/libexec  /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2/bin
patching script interpreter paths in /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2
checking for references to /build in /nix/store/k9i7lgs7bnx5v31vppdzf8n8jiyf4jny-gnome-shell-3.26.2...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gnome3.gdm, gnome3.gnome-shell

Partial log (click to expand)

shrinking /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2/lib/gnome-shell/libst-1.0.so
shrinking /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2/lib/gnome-shell/libgvc.so
shrinking /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2/lib/mozilla/plugins/libgnome-shell-browser-plugin.so
gzipping man pages under /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2/share/man/
strip is /nix/store/hy39vplmzpwckvzxgyhr54dwz0mnfv2p-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2/lib  /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2/libexec  /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2/bin
patching script interpreter paths in /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2
checking for references to /build in /nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2...
/nix/store/ckksdr839kda7fdzlvl156vkg2a9z1ba-gdm-3.26.2.1
/nix/store/q652ilv255jzph23n6nybk0zfzgzfmkv-gnome-shell-3.26.2

@xeji xeji merged commit 831ac69 into NixOS:release-18.03 Aug 5, 2018
@thefloweringash thefloweringash deleted the backport-gdm-fix branch August 19, 2018 03:29
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: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thefloweringash @xeji @GrahamcOfBorg @jtojnar