From b1b48e10de58f9de36825590071a27acc8792ba2 Mon Sep 17 00:00:00 2001 From: Matthew Mazzanti Date: Sat, 20 Mar 2021 20:35:45 -0400 Subject: [PATCH] openssh: Fix cross-compile regression from c99c499 (#117053) Co-authored-by: Sandro --- pkgs/tools/networking/openssh/common.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index f28c021fce3..53033b57442 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -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 @@ -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