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

SDL2: wayland support #30827

Merged
merged 1 commit into from Nov 6, 2017
Merged

SDL2: wayland support #30827

merged 1 commit into from Nov 6, 2017

Conversation

ghost
Copy link

@ghost ghost commented Oct 26, 2017 •
edited by ghost

Motivation for this change

Tested with SDL_VIDEODRIVER=wayland xonotic

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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.

@ghost ghost mentioned this pull request Oct 26, 2017
Closed
4 tasks
jb55
jb55 approved these changes Oct 27, 2017
View reviewed changes
Copy link
Contributor

@jb55 jb55 left a comment

Choose a reason for hiding this comment

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

nice

dezgeg
dezgeg reviewed Oct 31, 2017
View reviewed changes
pkgs/development/libraries/SDL2/default.nix Outdated
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {

# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++
lib.optional waylandSupport [ wayland wayland-protocols libxkbcommon.dev ] ++
Copy link
Contributor

Choose a reason for hiding this comment

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

This line adds the single value [ wayland wayland-protocols libxkbcommon.dev ] to propagatedBuildInputs, not those three. It should use lib.optionals, like:

lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]

Copy link
Author

Choose a reason for hiding this comment

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

@dezgeg Indeed, thank you!

@peterhoeg peterhoeg added this to General in Wayland Nov 1, 2017
@dezgeg dezgeg merged commit b0d193f into NixOS:staging Nov 6, 2017
@ghost ghost deleted the sdl branch November 6, 2017 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
Wayland
  
General
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jb55 @dezgeg @GrahamcOfBorg