Conversation
mmahut
left a comment
There was a problem hiding this comment.
Few cosmetic suggestions, other it works as expected.
- reviewed the diff and commit messages
- made sure ofBorg eval
- run nix-review without any failures
- run and tested the binaries
|
Fixed as suggested. Thank you for the prompt review. |
|
I think I've addressed all the comments. New commit force pushed. |
| buildInputs = [ openssh ]; | ||
|
|
||
| postPatch = '' | ||
| substituteInPlace Makefile --replace /usr/local $out |
There was a problem hiding this comment.
You can use "BIN=${placeholder "out"}/bin" in makeFlags.
|
|
||
| postPatch = '' | ||
| substituteInPlace Makefile --replace /usr/local $out | ||
| substituteInPlace Makefile --replace "-o root" "" |
There was a problem hiding this comment.
Perhaps use a patch, it will make it easier to notice when the substitution no longer applies
patches = [
# Do not install as root
(fetchpatch {
url = https://github.com/ndenev/mpssh/commit/3cbb868b6fdf8dff9ab86868510c0455ad1ec1b3.patch;
sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
})
];| substituteInPlace Makefile --replace "-o root" "" | ||
| ''; | ||
|
|
||
| makeFlags = "CC=cc LD=cc BIN=$(out)/bin SSHPATH=${openssh}/bin/ssh SCPPATH=${openssh}/bin/scp"; |
|
|
||
| makeFlags = "CC=cc LD=cc BIN=$(out)/bin SSHPATH=${openssh}/bin/ssh SCPPATH=${openssh}/bin/scp"; | ||
|
|
||
| meta = { |
There was a problem hiding this comment.
It is usually nicer to use with stdenv.lib here, so that it does not need to be repeated in meta.
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
|
Do you mind squashing your commits? |
|
@ktf are you able to address the above comments and continue with this PR? |
|
Thank you for your contributions.
|
Motivation for this change
New package.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)