oracle-instantclient: simplify a lot, use autoPatchelfHook #40900
+17
−47
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
8 tasks
GrahamcOfBorg
added
8.has: clean-up
8.has: package (new)
xeji
reviewed
May 22, 2018
|
|
||
| nativeBuildInputs = [ rpmextract patchelf makeWrapper ]; | ||
| unpackCmd = "${rpmextract}/bin/rpmextract $curSrc"; |
There was a problem hiding this comment.
Please add rpmextract to nativeBuildInputs since it is run during the build process.
Then it will be available in PATH and you can omit the prefix ${rpmextract}/bin here.
Split `buildCommand`, provide `unpackCmd` and add `installPhase`. Use autoPatchelfHook, we can get rid of all the manual hacking around with patchelf. Use install to install to $out
we requireFile, so hydra can't build it anyways.
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
After fixing some things in
oracle-instantclientfor #40688, the expression still was very messy.I did some refactoring of the build phase, and thanks to
autoPatchelfHookwe can get rid of all the manualpatchelfing, turning the expression a lot cleaner.As now everything is much more maintainable, I'm happy with adding myself as one :-)
Tested connecting to an oracle database through
python3Packages.sqlalchemyandpython3Packages.cx_oracle, plus executing thesqlplusbinary.Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)