wrapGAppsHook: Correct wrapProgram invocations
#25183
Merged
+4
−3
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. |
fpletz
approved these changes
Apr 27, 2017
|
This breaks at least mate-terminal and claws-mail: nix-build -A mate.mate-terminal |
|
Yeah, I see what happens. The patch passes those paths as arguments to |
peti
added a commit
that referenced
this pull request
Apr 28, 2017
This reverts commit 8b9f153 of #25183 because it breaks builds of packages that don't install both a "bin" and a "libexec" directory. See #25183 (comment) for more details.
|
OK, I've worked up a fix, and tested it on I think this PR needs to be reopened in order for the new commits to appear here, or I can open a new PR. |
7 tasks
|
|
|
Oh, nevermind. It is fixed now. https://hydra.nixos.org/build/52082092 |
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.
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
Wrapping directories inside
libexecbrokeemacs.Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)