Skip to content

openssh: fix cross-compilation #107606

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

Merged
Ericson2314 merged 1 commit into from
Dec 26, 2020
Merged

openssh: fix cross-compilation #107606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkgs/tools/networking/openssh/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv
, pkgs
Copy link
Member

@SuperSandro2000 SuperSandro2000 Dec 26, 2020

Choose a reason for hiding this comment

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

I thought you should never put pkgs into inputs?

Copy link
Member

@Ericson2314 Ericson2314 Dec 26, 2020

Choose a reason for hiding this comment

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

this is rare, but correct. It is just like doing buildPackages explicitly, with the reason being to disable splicing.

Copy link
Contributor

@nh2 nh2 Dec 26, 2020

Choose a reason for hiding this comment

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

It'd be best to have an explanatory comment then.

, fetchurl
, fetchpatch
, zlib
Expand Down Expand Up @@ -68,7 +69,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ pkgconfig ]
++ optional (hpnSupport || withGssapiPatches) autoreconfHook
++ optional withKerberos kerberos.dev;
++ optional withKerberos pkgs.kerberos.dev;
buildInputs = [ zlib openssl libedit pam ]
++ optional withFIDO libfido2
++ optional withKerberos kerberos;
Expand Down