wrapGAppsHook: Correct wrapProgram invocations
#25299
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
This change fixes several defects in the way `wrapGAppsHook` selected the executable to wrap. Previously, it would wrap any top-level files in the target `/bin` and `/libexec` directories, including directories and non-executable files. In addition, it failed to wrap files in subdirectories. Now, it uses `find` to iterate over these directory hierarchies, selecting only executable files for wrapping.
|
@ahmedtd, thanks for your PR! By analyzing the history of the files in this pull request, we identified @vcunat, @lethalman and @peti to be potential reviewers. |
|
Mentioning @fpletz and @mguentner, participants on original PR. |
|
Testing locally this fixes build failure reported here edcff00#commitcomment-21950339 Haven't tested beyond that. |
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.
(Continuation of #25183, fixing problems that occurred when merging)
This change fixes several defects in the way
wrapGAppsHookselectedthe executable to wrap.
Previously, it would wrap any top-level files in the target
/binand/libexecdirectories, including directories and non-executablefiles. In addition, it failed to wrap files in subdirectories.
Now, it uses
findto iterate over these directory hierarchies,selecting only executable files for wrapping.
Motivation for this change
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)