diffoscope: wrap executable and include tools in PATH #27534
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
diffoscope was looking for the tools it uses during runtime, but the tools there neither part of the closure nor were they in the PATH. This commit fixes this.
|
Thanks! |
|
Also fixed in 17.03. |
|
Doesn't this create a double wrapper script? |
|
ah, right. An alternative would been to use |
|
Yes it does. But is this a problem?
Am 21.07.2017 2:51 nachm. schrieb "Eelco Dolstra" <notifications@github.com
…:
Doesn't this create a double wrapper script?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#27534 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AGPa1J06niOYaTyni37Mfh2fu1m6WJEMks5sQJ7YgaJpZM4Oe9dS>
.
|
|
And what would be a better way to do this?
Am 21.07.2017 3:47 nachm. schrieb :
… Yes it does. But is this a problem?
Am 21.07.2017 2:51 nachm. schrieb "Eelco Dolstra" <
***@***.***>:
> Doesn't this create a double wrapper script?
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub
> <#27534 (comment)>, or mute
> the thread
> <https://github.com/notifications/unsubscribe-auth/AGPa1J06niOYaTyni37Mfh2fu1m6WJEMks5sQJ7YgaJpZM4Oe9dS>
> .
>
|
|
See also 91dc811#commitcomment-23226040 |
bugworm
pushed a commit
to bugworm/nixpkgs
that referenced
this pull request
Jul 23, 2017
Alternative fix for NixOS#27534 that prevents the use of a double wrapper (creating even uglier script names than usual, like ..diffoscope-wrapped-wrapped). This was my bad in 96d7f35.
adrianpk
added a commit
to adrianpk/nixpkgs
that referenced
this pull request
May 31, 2024
Alternative fix for NixOS#27534 that prevents the use of a double wrapper (creating even uglier script names than usual, like ..diffoscope-wrapped-wrapped). This was my bad in 96d7f35. (cherry picked from commit 91dc811)
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
diffoscope was looking for the tools it uses during runtime, but the
tools there neither part of the closure nor were they in the
PATH. This commit fixes this.
Things done
Wrapped the diffoscope executable.
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)