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

openssh_gssapi: fix build

Browse Source 
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:
Maximilian Bosch 2020-01-04 00:03:25 +01:00
parent b40fc3a56b
commit 8f0b3b1305
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/networking/openssh/default.nix
View File

@ -12,10 +12,8 @@ let
# **please** update this patch when you update to a new openssh release. # **please** update this patch when you update to a new openssh release.
gssapiPatch = fetchpatch { gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch"; name = "openssh-gssapi.patch";
url = "https://salsa.debian.org/ssh-team/openssh/raw/" url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.1p1-2/debian/patches/gssapi.patch";
+ "e50a98bda787a3b9f53ed67bdccbbac0bde1f9ae" sha256 = "0zfxx46a5lpjp317z354yyswa2wvmb1pp5p0nxsbhsrzw94jvxsj";
+ "/debian/patches/gssapi.patch";
sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2hv";
}; };
in in
@ -61,11 +59,9 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook;
buildInputs = [ zlib openssl libedit pam ] buildInputs = [ zlib openssl libedit pam ]
++ optional withKerberos kerberos ++ optional withKerberos kerberos;
++ optional hpnSupport autoreconfHook
;
preConfigure = '' preConfigure = ''
# Setting LD causes `configure' and `make' to disagree about which linker # Setting LD causes `configure' and `make' to disagree about which linker