mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-17 14:19:58 +03:00
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
This commit is contained in:
parent
b40fc3a56b
commit
8f0b3b1305
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user