public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssh: Fix cross-compile regression from c99c499 (#117053)

Browse Source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Matthew Mazzanti 2021-03-20 20:35:45 -04:00 committed by GitHub
parent 5147e2f017
commit b1b48e10de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/openssh/common.nix
View File

@ -8,6 +8,9 @@
}: }:
{ lib, stdenv { 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 , fetchurl
, fetchpatch , fetchpatch
, zlib , zlib
@ -42,7 +45,10 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkg-config ] 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; ++ extraNativeBuildInputs;
buildInputs = [ zlib openssl libedit ] buildInputs = [ zlib openssl libedit ]
++ optional withFIDO libfido2 ++ optional withFIDO libfido2