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

frozen-bubble: init at 2.212 #71814

Merged
merged 7 commits into from
Nov 4, 2019
Merged

Conversation

puckipedia
Copy link
Contributor

Motivation for this change
  • Patched sdl-config --libs to return the library path of all SDL-like packages, the same way it does with sdl-config --cflags right now. (the alternative to this would be to patch ExtUtils::CBuilder to understand that NIX_LDFLAGS exists, which should also be done at some point)
  • SDL_Pango has been fixed with a Debian patch, and a second custom patch.
  • Alien::SDL has been patched to skip trying to download sources from a now-defunct website, and to skip a broken test
  • frozen-bubble has had -Wall -Werror removed, and proper linkage for SDL_mixer (necessary to avoid include header errors)
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 nix-review --run "nix-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.
Notify maintainers

cc @lovek323 (for the SDL change)

Sorry, something went wrong.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Because of how nixpkgs works, all the SDL-umbrella libraries are in
different folders. On a usual system, when using `sdl-config --libs`,
this means that SDL_gfx would also be on the linker path. Some packages
seem to depend on this being the case.
@puckipedia puckipedia force-pushed the frozen-bubble branch 2 times, most recently from c96cb96 to 12c5aba Compare October 23, 2019 13:43
@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: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 501-1000 labels Oct 23, 2019
@FRidh FRidh requested review from lovek323 and volth October 23, 2019 14:11
@FRidh FRidh requested a review from volth November 3, 2019 09:59
@7c6f434c 7c6f434c merged commit d690c20 into NixOS:master Nov 4, 2019
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Nov 4, 2019
frozen-bubble: init at 2.212
(cherry picked from commit d690c20)
@Ericson2314
Copy link
Member

What about SDL2?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+ 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants