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

treewide: resholve everything, big refactor gamescope-session #167

Merged
merged 15 commits into from
Sep 27, 2023

Conversation

K900
Copy link
Contributor

@K900 K900 commented Sep 23, 2023

This basically gives us a working vendor flavored gamescope-session with no (as far as I've found) functional regressions, and also some improvements (powerbuttond, Steam as default URL handler, non-broken portals pending 1.18 in nixpkgs). Probably best viewed commit by commit, though the last one is big.


TODO

  • Verify OOBE works using the test iso

@K900 K900 requested review from samueldr and zhaofengli September 23, 2023 13:59
@pongo1231
Copy link
Contributor

Fixes #158 on my end

Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

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

Some notes and changes, not "done" yet, need to test and looks at some bits more carefully.

pkgs/steam_notif_daemon/default.nix Outdated Show resolved Hide resolved
pkgs/steam_notif_daemon/default.nix Outdated Show resolved Hide resolved
pkgs/steam_notif_daemon/default.nix Outdated Show resolved Hide resolved
modules/steam/autostart.nix Show resolved Hide resolved
pkgs/jovian-stubs/steamos-select-branch Outdated Show resolved Hide resolved
pkgs/steam-jupiter/fhsenv.nix Outdated Show resolved Hide resolved
pkgs/jovian-stubs/steamos-update Show resolved Hide resolved
pkgs/steam-jupiter/fhsenv.nix Outdated Show resolved Hide resolved
Comment on lines +8 to +15
if [[ -n "$positional" ]]; then
final+=("$value")
elif [[ "$value" == "-n" ]]; then
:
else
positional="y"
final+=("$value")
fi
Copy link
Member

Choose a reason for hiding this comment

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

I suppose I'm missing something from the initial WIP, but did this end-up needlessly doing the same thing in the first and last branch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't change this bit at all.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But yes.

pkgs/jupiter-hw-support/default.nix Outdated Show resolved Hide resolved
@samueldr samueldr added 2. priority: 2. normal 2. topic: system integration About our integration of Steam stuff within NixOS labels Sep 24, 2023
@jovian-experiments

This comment was marked as outdated.

samueldr pushed a commit to www-jovian/Jovian-NixOS-PR167 that referenced this pull request Sep 24, 2023
@K900 K900 force-pushed the resholvening branch 3 times, most recently from b19e95c to 011a3f5 Compare September 24, 2023 07:38
@misuzu
Copy link

misuzu commented Sep 24, 2023

Doesn't build for me (NixOS/nixpkgs@e35dcc0, 011a3f5)

python2.7-oildev-unstable> pyext/posixmodule.c: In function ‘posix_close_’:
python2.7-oildev-unstable> pyext/posixmodule.c:1985:10: warning: implicit declaration of function ‘_PyVerify_fd’ [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration-Wimp
licit-function-declaration8;;]
python2.7-oildev-unstable>  1985 |     if (!_PyVerify_fd(fd))
python2.7-oildev-unstable>       |          ^~~~~~~~~~~~
python2.7-oildev-unstable> FATAL: FAIL _test/unit/pyext/posix_test.py.log
python2.7-oildev-unstable> /nix/store/vr6wwdxkmyy44sg0gwxi10b8fc5zhwz0-stdenv-linux/setup: line 144: pop_var_context: head of shell_variables not a function context
error: builder for '/nix/store/mzca1wr9jrll1gwxgjblfs8n71qrmw8m-python2.7-oildev-unstable-2021-07-14.drv' failed with exit code 1;
       last 10 log lines:
       >   215 | # define _XOPEN_SOURCE  700
       >       |
       > OK _test/unit/pyext/libc_test.py.log
       >   (pyext/setup_posix.py) -> posix_.so
       > pyext/posixmodule.c: In function ‘posix_close_’:
       > pyext/posixmodule.c:1985:10: warning: implicit declaration of function ‘_PyVerify_fd’ [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration-Wimplicit-function-dec
laration8;;]
       >  1985 |     if (!_PyVerify_fd(fd))
       >       |          ^~~~~~~~~~~~
       > FATAL: FAIL _test/unit/pyext/posix_test.py.log
       > /nix/store/vr6wwdxkmyy44sg0gwxi10b8fc5zhwz0-stdenv-linux/setup: line 144: pop_var_context: head of shell_variables not a function context
       For full logs, run 'nix log /nix/store/mzca1wr9jrll1gwxgjblfs8n71qrmw8m-python2.7-oildev-unstable-2021-07-14.drv'.
error: 1 dependencies of derivation '/nix/store/ari8af043m8lkrn8i597dbadj3qnlvq3-resholve-0.9.0.drv' failed to build

@K900
Copy link
Contributor Author

K900 commented Sep 24, 2023

Resholve is currently busted on unstable, try latest unstable-small

samueldr pushed a commit to www-jovian/Jovian-NixOS-PR167 that referenced this pull request Sep 24, 2023
@jovian-experiments
Copy link

jovian-experiments bot commented Sep 24, 2023

Hi there!

In the next few minutes a fresh preview of the docs for f7efa70 will be available at https://www-jovian.github.io/Jovian-NixOS-PR167/.

See also the generated diff at: https://github.com/www-jovian/Jovian-NixOS-PR167

Cheers!


Beep-boop, this comment was auto-generated for www-jovian.

@K900 K900 force-pushed the resholvening branch 2 times, most recently from afc6187 to dfbc357 Compare September 24, 2023 08:04
samueldr pushed a commit to www-jovian/Jovian-NixOS-PR167 that referenced this pull request Sep 24, 2023
samueldr pushed a commit to www-jovian/Jovian-NixOS-PR167 that referenced this pull request Sep 24, 2023
@samueldr

This comment was marked as resolved.

@K900
Copy link
Contributor Author

K900 commented Sep 25, 2023

Tested the OOBE last night, works fine.

@K900
Copy link
Contributor Author

K900 commented Sep 25, 2023

Also tested Vampire Survivors, the game that the comment in the upstream unit file says made them log to a file instead of the journal, and that also runs fine now.

Copy link

@misuzu misuzu left a comment

Choose a reason for hiding this comment

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

The "verifying installation" thing is gone for me

@samueldr
Copy link
Member

Looks like everything works as expected.

@K900 K900 merged commit a6efb4b into development Sep 27, 2023
50 checks passed
@samueldr samueldr deleted the resholvening branch September 27, 2023 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2. priority: 2. normal 2. topic: system integration About our integration of Steam stuff within NixOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants