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

bind: fix collision of binaries in outputs #21685

Merged
merged 1 commit into from Jan 7, 2017

Conversation

fpletz
Copy link
Member

@fpletz fpletz commented Jan 5, 2017

Motivation for this change

Using outputsToInstall the intended behaviour of including host and dnsutils when bind is installed can be implemented instead of using symlinks to fix installing all outputs individually with nix-env.

Fixes #19761.

Things done
  • 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 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.

@mention-bot
Copy link

@fpletz, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @dezgeg and @peti to be potential reviewers.

@fpletz
Copy link
Member Author

fpletz commented Jan 5, 2017

cc @vcunat @NeQuissimus @polyrod
ref #21677

@vcunat
Copy link
Member

vcunat commented Jan 5, 2017

There's a bind.bin reference in the service. I can't see anything else that might cause problems.

@fpletz
Copy link
Member Author

fpletz commented Jan 5, 2017

Right! Didn't check that, thanks! Fixed.

Using outputsToInstall the intended behaviour of including host and dnsutils
when bind is installed can be implemented instead of using symlinks to fix
installing all outputs individually with nix-env.

Fixes NixOS#19761.
@fpletz fpletz merged commit db8b044 into NixOS:master Jan 7, 2017
@fpletz fpletz deleted the fix/bind-outputs branch January 7, 2017 10:37
@vcunat
Copy link
Member

vcunat commented Jan 9, 2017

Hmm, there's a small catch. Previously, adding bind into buildInputs made those utilities available, and now it doesn't anymore. We might use propagatedBuildOutputs, though for now I'll just use more explicit specifications of dependencies, e.g. in c82baee.

vcunat added a commit that referenced this pull request Jan 9, 2017
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.

bind: binary collision / multiple outputs
3 participants