Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9ceb252d30ca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6158b9ef7c70
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 16, 2019

  1. autossh: fix for cross compilation

    @illegalprime
    illegalprime committed Mar 16, 2019
    Copy the full SHA
    f17231b View commit details

Commits on Mar 24, 2019

  1. Merge pull request #57825 from illegalprime/fix/autossh-cross 

    autossh: fix for cross compilation
    @Mic92
    Mic92 authored Mar 24, 2019
    Copy the full SHA
    6158b9e View commit details
Showing with 10 additions and 5 deletions.
  1. +10 −5 pkgs/tools/networking/autossh/default.nix
15 changes: 10 additions & 5 deletions pkgs/tools/networking/autossh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,19 @@

stdenv.mkDerivation rec {
name = "autossh-1.4g";

src = fetchurl {
url = "http://www.harding.motd.ca/autossh/${name}.tgz";
sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz";
};

buildInputs = [ openssh ];


preConfigure = ''
export ac_cv_func_malloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull=yes
'';

nativeBuildInputs = [ openssh ];

installPhase =
''
install -D -m755 autossh $out/bin/autossh || return 1
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1
install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1
'';

meta = with stdenv.lib; {
homepage = http://www.harding.motd.ca/autossh/;
description = "Automatically restart SSH sessions and tunnels";