From 8f0b3b1305c836cc1ad20b68a613ec9f8fb4e8dc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 4 Jan 2020 00:03:25 +0100 Subject: [PATCH] openssh_gssapi: fix build Hydra build is failing[1] because of a hash-mismatch of the gss-api patch from debian. I updated the patch, and activated the `autoreconfHook` when building gss support as well, otherwise the build would fail with the following error: ``` ERROR: configure is out of date; please run autoreconf (and configure) ``` [1] https://hydra.nixos.org/build/109409845 --- pkgs/tools/networking/openssh/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 2a1122029c1..90ecba0891d 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -12,10 +12,8 @@ let # **please** update this patch when you update to a new openssh release. gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/" - + "e50a98bda787a3b9f53ed67bdccbbac0bde1f9ae" - + "/debian/patches/gssapi.patch"; - sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2hv"; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.1p1-2/debian/patches/gssapi.patch"; + sha256 = "0zfxx46a5lpjp317z354yyswa2wvmb1pp5p0nxsbhsrzw94jvxsj"; }; in @@ -61,11 +59,9 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook; buildInputs = [ zlib openssl libedit pam ] - ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook - ; + ++ optional withKerberos kerberos; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker