openssh: fix cross-compilation #107606
Merged
openssh: fix cross-compilation #107606
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krb5-config from the host platform needs to be added to PATH so it can be run during build. This works because krb5-config is a platform independent shell-script. Before NixOS#100906, krb5-config was not used, so we didn't run into this problem.
| @@ -1,4 +1,5 @@ | |||
| { stdenv | |||
| , pkgs | |||
There was a problem hiding this comment.
I thought you should never put pkgs into inputs?
There was a problem hiding this comment.
this is rare, but correct. It is just like doing buildPackages explicitly, with the reason being to disable splicing.
There was a problem hiding this comment.
It'd be best to have an explanatory comment then.
10 tasks
|
Ah, good old #51176 yet again. |
|
I did find myself compelled to to do the "real solution" with #107647 and openssh/openssh-portable#219. |
|
@Ericson2314 That is very much appreciated! |
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
krb5-config from the host platform needs to be added to
PATHso it can be run during build. This works becausekrb5-configis a platform independent shell-script. Before #100906,krb5-configwas not used, so we didn't run into this problem.cc @KAction @nh2
cc @Ericson2314 Is this the best way of solving this problem?
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)