Skip to content

openssh: Fix cross-compile regression from c99c499 #117053

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
SuperSandro2000 merged 2 commits into from
Mar 21, 2021
Merged

openssh: Fix cross-compile regression from c99c499 #117053

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c74048
openssh: Fix cross-compile regression from #c99c499
matthewmazzanti Mar 20, 2021
97d662c
Fix typo
matthewmazzanti Mar 20, 2021
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
8 changes: 7 additions & 1 deletion pkgs/tools/networking/openssh/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
}:

{ lib, stdenv
# This *is* correct, though unusual. as a way of getting krb5-config from the
# package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606
, pkgs
, fetchurl
, fetchpatch
, zlib
Expand Down Expand Up @@ -42,7 +45,10 @@ stdenv.mkDerivation rec {
'';

nativeBuildInputs = [ pkg-config ]
++ optional withKerberos kerberos
# This is not the same as the kerberos from the inputs! pkgs.kerberos is
# needed here to access krb5-config in order to cross compile. See:
# https://github.com/NixOS/nixpkgs/pull/107606
++ optional withKerberos pkgs.kerberos
++ extraNativeBuildInputs;
buildInputs = [ zlib openssl libedit ]
++ optional withFIDO libfido2
Expand Down