Skip to content

Commit 53951b7

Browse files
committed
prefer system's openssh
fixes #62
1 parent 8dd7a0e commit 53951b7

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

src/default.nix

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
, gnugrep
99
, findutils
1010
, gnused
11+
, lib
12+
, mkShellNoCC
1113
}:
1214
let
1315
runtimeInputs = [
14-
openssh
1516
gitMinimal # for git flakes
1617
rsync
1718
nix
@@ -24,9 +25,16 @@ let
2425
in
2526
(writeShellApplication {
2627
name = "nixos-anywhere";
27-
text = builtins.readFile ./nixos-anywhere.sh;
28+
# We prefer the system's openssh over our own, since it might come with features not present in ours:
29+
# https://github.com/numtide/nixos-anywhere/issues/62
30+
text = ''
31+
export PATH=$PATH:${lib.getBin openssh}
32+
${builtins.readFile ./nixos-anywhere.sh}
33+
'';
2834
inherit runtimeInputs;
2935
}) // {
30-
# also expose this attribute to other derivations
31-
inherit runtimeInputs;
36+
# Dependencies for our devshell
37+
devShell = mkShellNoCC {
38+
packages = runtimeInputs ++ [ openssh ];
39+
};
3240
}

src/flake-module.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
nixos-anywhere = pkgs.callPackage ./. { };
55
default = config.packages.nixos-anywhere;
66
};
7-
devShells.default = pkgs.mkShellNoCC {
8-
packages = config.packages.nixos-anywhere.runtimeInputs;
9-
};
7+
devShells.default = config.packages.nixos-anywhere.devShell;
108
};
119
}

0 commit comments

Comments
 (0)