git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #57825 from illegalprime/fix/autossh-cross

autossh: fix for cross compilation

commit6158b9ef7c709ab41b538850f7af85ab924b2af5 authorJörg Thalheim <Mic92@users.noreply.github.com> dateSun 24 Mar 2019, 06:35 (8 years ago) parent9ceb252f17231b
1 file changed+10−5
pkgs/tools/networking/autossh/default.nix+10−5
pkgs/tools/networking/autossh/default.nix+10−5
@@ -2,14 +2,19 @@
22
33stdenv.mkDerivation rec {
44 name = "autossh-1.4g";
5−
5+
66 src = fetchurl {
77 url = "http://www.harding.motd.ca/autossh/${name}.tgz";
88 sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz";
99 };
10−
11− buildInputs = [ openssh ];
12−
10+
11+ preConfigure = ''
12+ export ac_cv_func_malloc_0_nonnull=yes
13+ export ac_cv_func_realloc_0_nonnull=yes
14+ '';
15+
16+ nativeBuildInputs = [ openssh ];
17+
1318 installPhase =
1419 ''
1520 install -D -m755 autossh $out/bin/autossh || return 1
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
1924 install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1
2025 install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1
2126 '';
22−
27+
2328 meta = with stdenv.lib; {
2429 homepage = http://www.harding.motd.ca/autossh/;
2530 description = "Automatically restart SSH sessions and tunnels";