diff --git a/flake.nix b/flake.nix index 7d0dc9f..b26bada 100644 --- a/flake.nix +++ b/flake.nix @@ -379,7 +379,7 @@ inherit (spkgs) matrix-synapse; xin = upkgs.callPackage ./bins/xin { inherit upkgs; }; - openssh = upkgs.callPackage ./pkgs/openssh.nix { inherit upkgs; }; + openssh = upkgs.pkgsMusl.callPackage ./pkgs/openssh.nix { inherit upkgs; }; }); templates = { diff --git a/pkgs/openssh.nix b/pkgs/openssh.nix index f968204..e2ed8c6 100644 --- a/pkgs/openssh.nix +++ b/pkgs/openssh.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./openssh/dont_create_privsep_path.patch + ./openssh/fix-164ea4380564a2a83713eacf71908e3946e5e4e4.diff ]; postPatch = diff --git a/pkgs/openssh/fix-164ea4380564a2a83713eacf71908e3946e5e4e4.diff b/pkgs/openssh/fix-164ea4380564a2a83713eacf71908e3946e5e4e4.diff new file mode 100644 index 0000000..b2f51b9 --- /dev/null +++ b/pkgs/openssh/fix-164ea4380564a2a83713eacf71908e3946e5e4e4.diff @@ -0,0 +1,12 @@ +diff --git a/sshd-auth.c b/sshd-auth.c +index 53658cf11..b071c59b1 100644 +--- a/sshd-auth.c ++++ b/sshd-auth.c +@@ -464,7 +464,6 @@ main(int ac, char **av) + __progname = ssh_get_progname(av[0]); + + /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ +- saved_argc = ac; + saved_argv = xcalloc(ac + 1, sizeof(*saved_argv)); + for (i = 0; (int)i < ac; i++) + saved_argv[i] = xstrdup(av[i]);