Skip to content

xonotic: split glx, sdl, dedicated, data #83461

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
Merged
1 commit merged into from Apr 2, 2020
Merged

xonotic: split glx, sdl, dedicated, data #83461

1 commit merged into from Apr 2, 2020
+154 −66

Conversation

ghost
Copy link

@ghost ghost commented Mar 27, 2020 •
edited by ghost
Loading

This has many advantages:

  • Each variant can be installed without pulling in the dependencies of the
    other variants, which makes it possible to build an SDL variant
    without X11 dependencies
  • Hydra can now build binaries without downloading 1GB of data, so users
    do not have to build them on their own machines
  • Users do not have to redownload 1GB of data after each dependency
    update

Includes the following fixes:

  • Add dependency on libGL for GLX variant as it failed to load
  • Pass -j and -l to make to enable parallel building
  • Quote homepage URI and use https
  • Add a .desktop file and icons
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.

Sorry, something went wrong.

@ghost ghost requested a review from astsmtl March 27, 2020 03:05
@ghost
Copy link
Author

ghost commented Mar 27, 2020

CC @umazalakain @kloenk for review

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Mar 27, 2020
@ghost
Copy link
Author

ghost commented Mar 27, 2020

@GrahamcOfBorg build xonotic-sdl-unwrapped xonotic-glx-unwrapped xonotic-dedicated-unwrapped

@kloenk
Copy link
Member

kloenk commented Mar 29, 2020

Like it, all binaries are working on my NixOS.
I started building a server module, making use of the split of dedicated server binary

@kloenk kloenk mentioned this pull request Mar 30, 2020
Closed
10 tasks
xonotic: split glx, sdl, dedicated, data

Verified

This commit was signed with the committer’s verified signature.
Doctor-wu Doctor Wu
GPG key ID: 7D1412F015912FB2
Verified
Learn about vigilant mode
30fd09e 
This has many advantages:
- Each variant can be installed without pulling in the dependencies of the
  other variants, which makes it possible to build an SDL variant
  without X11 dependencies
- Hydra can now build binaries without downloading 1GB of data, so users
  do not have to build them on their own machines
- Users do not have to redownload 1GB of data after each dependency
  update

Includes the following fixes:
- Add dependency on libGL for GLX variant as it will fail in some
  environments otherwise
- Pass -j and -l to make to enable parallel building
- Quote homepage URI and use https
- Add a .desktop file and icons
@kloenk
Copy link
Member

kloenk commented Apr 2, 2020 •
edited
Loading

I did some more testing, Both the sdl version and the glx version are running under Wayland (sway). The glx version automaticly starts Xwayland to run in in Xorg.
Under Xorg(plasma5) also both versions are running fine and the desktop file shows a logo (wofi under sway doesn't show any logos).
The dedicated binary also works fine providing my own test server at the moment which is perfectly running

@ghost ghost merged commit 90354cd into NixOS:master Apr 2, 2020
@ghost
Copy link
Author

ghost commented Apr 2, 2020

Thanks for testing!

@alexeymuranov alexeymuranov mentioned this pull request May 15, 2020
Closed
10 tasks
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@astsmtl astsmtl

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@kloenk