b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pkgsStatic.openssh: fix build

Browse source 
Remove reference to libredirect for cross builds, as for those the tests are disabled:
4818f809a9/pkgs/stdenv/generic/make-derivation.nix (L103)
This commit is contained in:
Dmitry Kalinkin 2022-01-17 13:16:53 -05:00
parent bd05750ca6
commit b7480c8674
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/tools/networking/openssh/common.nix
View file

@ -63,22 +63,6 @@ stdenv.mkDerivation rec {
# Setting LD causes `configure' and `make' to disagree about which linker
# to use: `configure' wants `gcc', but `make' wants `ld'.
unset LD
''
# Upstream build system does not support static build, so we fall back
# on fragile patching of configure script.
#
# libedit is found by pkg-config, but without --static flag, required
# to get also transitive dependencies for static linkage, hence sed
# expression.
#
# Kerberos can be found either by krb5-config or by fall-back shell
# code in openssh's configure.ac. Neither of them support static
# build, but patching code for krb5-config is simpler, so to get it
# into PATH, libkrb5.dev is added into buildInputs.
+ optionalString stdenv.hostPlatform.isStatic ''
sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure
sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure
sed -i 's#KRB5CONF --libs gssapi`#KRB5CONF --libs gssapi` -lkrb5support -lkeyutils#g' configure
'';
# I set --disable-strip because later we strip anyway. And it fails to strip
@ -98,6 +82,8 @@ stdenv.mkDerivation rec {
++ optional (!linkOpenssl) "--without-openssl"
++ extraConfigureFlags;
${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ];
buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ];
enableParallelBuilding = true;
@ -107,7 +93,7 @@ stdenv.mkDerivation rec {
doCheck = true;
enableParallelChecking = false;
checkInputs = optional (!stdenv.isDarwin) hostname;
preCheck = ''
preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
# construct a dummy HOME
export HOME=$(realpath ../dummy-home)
mkdir -p ~/.ssh