Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wrapGAppsHook: Correct wrapProgram invocations #29419

Closed
wants to merge 1 commit into from

Conversation

timor
Copy link
Member

@timor timor commented Sep 15, 2017

Cherry-picked from 2cd342c

Motivation for this change

fixes issue #25756 for 17.03, which has not been backported yet

original commit message below

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.

Things done

Cherry-picked commit, built emacs and tried out hexl-mode, which workds now. Have not tested any other build. Also built a firefox, seemed to work fine.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

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.
@mention-bot
Copy link

@timor, 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.

@joachifm
Copy link
Contributor

Per 2cd342c#commitcomment-22034819 this commit originally caused some problems for firefox, which were later fixed. I expect we need to backport those fixes as well?

@fpletz fpletz added this to the 17.03 milestone Sep 15, 2017
@timor
Copy link
Member Author

timor commented Sep 15, 2017

I looked into the source and it seems that particular fix has been applied. I am building firefox to try it out, but that takes a while...

@timor
Copy link
Member Author

timor commented Sep 15, 2017

I built a firefox with that fix, and as expected, there are no crashes in open/save dialogs.

@Ericson2314
Copy link
Member

Ericson2314 commented Feb 26, 2018

Can this be closed? Or merged?

@timor
Copy link
Member Author

timor commented Mar 1, 2018

I am not using 17.03 anymore, so for me it is not important right now, but how is the policy regarding backports for old releases?

@matthewbauer
Copy link
Member

Closing - it's now in 18.03.

@timor timor deleted the fix-wrapGAppsHook branch April 23, 2018 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants