From c1c314c36f849be027226a0c811370e9f076408a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 19 Jul 2017 08:44:55 -0500 Subject: [PATCH] openssh: unset LD Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98, sets the LD environment variable by default, but this confuses the openssh Makefile because `configure' does not respect it. --- pkgs/tools/networking/openssh/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index aaef2723da0c..c0440e78a389 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ++ optional withKerberos kerberos ++ optional hpnSupport autoreconfHook; + preConfigure = '' + # Setting LD causes `configure' and `make' to disagree about which linker + # to use: `configure' wants `gcc', but `make' wants `ld'. + unset LD + ''; + # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. configureFlags = [