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.

Sign up for GitHub

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

Jump to bottom

bundlerApp: don't execute postBuild twice #60502

Merged
merged 1 commit into from May 4, 2019
Merged

bundlerApp: don't execute postBuild twice #60502

merged 1 commit into from May 4, 2019

Conversation

manveru
Copy link
Contributor

@manveru manveru commented Apr 30, 2019 •
edited

Motivation for this change

The hook was executed twice, also in the basicEnv.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Lassulus
Copy link
Member

maybe I'm stupid, but where is the second (not removed) execution of postBuild?

@manveru
Copy link
Contributor Author

manveru commented Apr 30, 2019

it's happening via basicEnv, which gets passed the args containing postBuild. So if we instead call it via basicEnv = (callPackage ../bundled-common {}) (removeAttrs args [ "postBuild" ]); we don't get a double execution.
I'm not 100% sure what the original intent was, but I know that at least for the homesick, the double postBuild resulted in a double execution, messing a bit with the executable it was patching.

alyssais
alyssais approved these changes Apr 30, 2019
View reviewed changes
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only time I could see this being useful is if somebody wanted to modify the wrapped executables, which I think should never be required.

@alyssais alyssais merged commit 36d7830 into NixOS:master May 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alyssais alyssais alyssais approved these changes

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
6.topic: ruby 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@manveru @Lassulus @alyssais