quake3e: init at 2019-09-09 #69216
Merged
quake3e: init at 2019-09-09 #69216
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
pmiddend
force-pushed
the
init-quake3e
branch
from
72d5efe
to
6f633aa
Compare
jonringer
reviewed
Sep 22, 2019
pmiddend
force-pushed
the
init-quake3e
branch
from
6f633aa
to
e352c87
Compare
|
@jonringer Thanks for the review. I've fixed your suggestions. |
jonringer
approved these changes
Sep 22, 2019
|
Any update on this? |
|
builds fine, I would just like for someone else who owns quake, to also verify that it works :/ |
Lassulus
approved these changes
Oct 2, 2019
ck3d
reviewed
Oct 6, 2019
| enableParallelBuilding = true; | ||
|
|
||
| postPatch = '' | ||
| sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c |
There was a problem hiding this comment.
code/client/cl_curl.c tries to load libcurl.so, is there a reason not to patch the loader?
| sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c | ||
| sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c | ||
| sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c | ||
| ''; |
There was a problem hiding this comment.
Instead of patching the source code to get the right path to the library, two possible less intrusive proposals:
- you could change the build system and pass these libraries to the linker of the executable via LDFLAGS
- you could fix the missing RPATH in the executable after linking the execuable in the fixupPhase with patchelf
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.
Motivation for this change
I wanted this package in nixpkgs.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)