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

gnome-session: add wrapGAppsHook #42159

Closed
wants to merge 3 commits into from
Closed

gnome-session: add wrapGAppsHook #42159

wants to merge 3 commits into from

Conversation

lukateras
Copy link
Member

@lukateras lukateras commented Jun 18, 2018 •
edited

Motivation for this change

This is required to start Wayland session without nix-shell.

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/)
  • Fits CONTRIBUTING.md.

@lukateras lukateras requested a review from jtojnar June 18, 2018 12:11
@lukateras
Copy link
Member Author

Additionally, maybe this should now be removed or changed:

    wrapProgram "$out/bin/gnome-session" \
      --prefix PATH : "${glib.dev}/bin" \
      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
      --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
      --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\
      --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg"

@GrahamcOfBorg GrahamcOfBorg added 6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Jun 18, 2018
@jtojnar
Copy link
Contributor

jtojnar commented Jun 18, 2018

Yes, we should not double wrap.

@lukateras
gnome-session: remove wrapProgram
3e7bbe4 
This doesn't cause any regressions for me (I've been using gnome-session
with wrapGAppsHook and without wrapProgram for the last two months).
@lukateras
Copy link
Member Author

@GrahamcOfBorg build gnome3.gnome-session

@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.gnome-session

Partial log (click to expand)

Cannot nix-instantiate `gnome3.gnome-session' because:
error: while evaluating 'callPackageWith' at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:113:35, called from /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/desktops/gnome-3/default.nix:145:19:
while evaluating 'makeOverridable' at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:72:24, called from /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix:117:8:
undefined variable 'makeWrapper' at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/desktops/gnome-3/core/gnome-session/default.nix:17:35

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: gnome3.gnome-session

Partial log (click to expand)

Cannot nix-instantiate `gnome3.gnome-session' because:
error: while evaluating 'callPackageWith' at /home/ofborg/ofborg1/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-7c6f434c1/lib/customisation.nix:113:35, called from /home/ofborg/ofborg1/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-7c6f434c1/pkgs/desktops/gnome-3/default.nix:145:19:
while evaluating 'makeOverridable' at /home/ofborg/ofborg1/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-7c6f434c1/lib/customisation.nix:72:24, called from /home/ofborg/ofborg1/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-7c6f434c1/lib/customisation.nix:117:8:
undefined variable 'makeWrapper' at /home/ofborg/ofborg1/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-7c6f434c1/pkgs/desktops/gnome-3/core/gnome-session/default.nix:17:35

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: gnome3.gnome-session

Partial log (click to expand)

Cannot nix-instantiate `gnome3.gnome-session' because:
error: while evaluating 'callPackageWith' at /var/lib/gc-of-borg/nix-test-rs-10/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-10/lib/customisation.nix:113:35, called from /var/lib/gc-of-borg/nix-test-rs-10/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-10/pkgs/desktops/gnome-3/default.nix:145:19:
while evaluating 'makeOverridable' at /var/lib/gc-of-borg/nix-test-rs-10/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-10/lib/customisation.nix:72:24, called from /var/lib/gc-of-borg/nix-test-rs-10/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-10/lib/customisation.nix:117:8:
undefined variable 'makeWrapper' at /var/lib/gc-of-borg/nix-test-rs-10/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-10/pkgs/desktops/gnome-3/core/gnome-session/default.nix:17:35

@jtojnar
Copy link
Contributor

jtojnar commented Jun 18, 2018

IIRC, at least some of the variables are not added by the wrapGAppsHook. You will need to inspect the generated wrapper and add the missing ones with gappsWrapperArgs.

@hedning
Copy link
Contributor

hedning commented Dec 13, 2018

This is now fixed in d54bfa8. Not sure how I missed this PR, might've helped to figure out that it was libexec/gnome-session-binary that needed wrapping earlier.

@hedning hedning closed this Dec 13, 2018
@lheckemann lheckemann deleted the yegortimoshenko-patch-7 branch July 9, 2020 11:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
2.status: merge conflict 6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lukateras @jtojnar @GrahamcOfBorg @hedning @xeji