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

drbd: fix output file location #23541

Merged
merged 1 commit into from Mar 20, 2017
Merged

Conversation

bennofs
Copy link
Contributor

@bennofs bennofs commented Mar 5, 2017

drbd was installing files into $out/nix/store/... due to the usage of DESTDIR
(setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...)

I'm unfortunately not very familar with this package, so I don't know how to properly test my changes.

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.

drbd was installing files into $out/nix/store/... due to the usage of DESTDIR
(setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...)
@mention-bot
Copy link

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

@Mic92
Copy link
Member

Mic92 commented Mar 6, 2017

The package is also very old: 9.06 is the current version: https://www.drbd.org/en/community/download

@joachifm
Copy link
Contributor

I expect this fixes #21051

@bennofs
Copy link
Contributor Author

bennofs commented Mar 11, 2017

@joachifm yes it should. as I said, I don't actually use drbd, so I cannot verify that.

@joachifm
Copy link
Contributor

@bennofs me neither; I think that if the resulting output at least has the correct layout, it has to be better than what is already in the tree.

@vcunat vcunat merged commit 8c0074d into NixOS:master Mar 20, 2017
globin pushed a commit that referenced this pull request Mar 20, 2017
drbd was installing files into $out/nix/store/... due to the usage of DESTDIR
(setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...)
(cherry picked from commit 8c0074d)
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

5 participants