python3.pkgs.pysdl2: fix build #98300
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Builds successfully on macos 10.14 & non-nixos linux x86_64. Seems like a slightly better approach than previously. |
jonringer
reviewed
Sep 23, 2020
Comment on lines
23
to
32
| substituteInPlace sdl2/dll.py --replace \ | ||
| "DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')" | ||
| "SDL2-path-from-nix" "${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}" | ||
| substituteInPlace sdl2/sdlttf.py --replace \ | ||
| "DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')" | ||
| "SDL2_ttf-path-from-nix" "${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}" | ||
| substituteInPlace sdl2/sdlimage.py --replace \ | ||
| "DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')" | ||
| "SDL2_image-path-from-nix" "${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}" | ||
| substituteInPlace sdl2/sdlgfx.py --replace \ | ||
| "DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')" | ||
| "SDL2_gfx-path-from-nix" "${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}" | ||
| substituteInPlace sdl2/sdlmixer.py --replace \ | ||
| "DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')" | ||
| "SDL2_mixer-path-from-nix" "${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}" |
There was a problem hiding this comment.
we have a substitueAll utility that's usually meant for this type of large substitution
example:
06960ac
There was a problem hiding this comment.
however, i forgot to post this review like 3 days ago. I think what you have works though
There was a problem hiding this comment.
I see, that makes for cleaner code. Take a look at the updated commit.
Update patches after version bump.
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update patches after version bump.
I ran examples bundled with the library and they seem to run okay.
ZHF: #97479
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)