jsoncpp: 1.9.2 -> 1.9.4 #102379
Merged
jsoncpp: 1.9.2 -> 1.9.4 #102379
+7
−18
Conversation
This file contains hidden or 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
| @@ -23,27 +23,13 @@ stdenv.mkDerivation rec { | |||
| # Hack to be able to run the test, broken because we use | |||
| # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install | |||
| preBuild = if stdenv.isDarwin then '' | |||
| export DYLD_LIBRARY_PATH="`pwd`/src/lib_json''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" | |||
| export DYLD_LIBRARY_PATH="`pwd`/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" | |||
There was a problem hiding this comment.
Suggested change
| export DYLD_LIBRARY_PATH="`pwd`/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" | |
| export DYLD_LIBRARY_PATH="$(pwd)/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" |
| '' else '' | ||
| export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" | ||
| export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" |
There was a problem hiding this comment.
Suggested change
| export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" | |
| export LD_LIBRARY_PATH="$(pwd)/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" |
r-burns
approved these changes
Nov 1, 2020
Merges both patches previously applied. Also seems to change the path that the library is written to.
CrystalGamma
force-pushed
the
pr-jsoncpp-update
branch
from
db92344 to
f352109
Compare
|
Thanks for the feedback. I went ahead and replaced the backtick expansion (can't actually quote it here because I can't get escaping the backticks to work right) by |
13 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.
Merges both patches previously applied. Also seems to change the path that the library is written to.
Motivation for this change
Fixes a build failure on platforms with unsigned
chartype, which was fixed with a patch on ARM only, but is needed on ppc64le (CC @r-burns) too. Updating to latest upstream release is probably cleaner than adding another platform test to the patch.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)