mirror of
https://github.com/nix-community/nixos-anywhere.git
synced 2024-09-11 16:45:28 +03:00
Merge #66
66: prefer system's openssh r=phaer a=Mic92 Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
commit
74c8547240
@ -8,10 +8,11 @@
|
||||
, gnugrep
|
||||
, findutils
|
||||
, gnused
|
||||
, lib
|
||||
, mkShellNoCC
|
||||
}:
|
||||
let
|
||||
runtimeInputs = [
|
||||
openssh
|
||||
gitMinimal # for git flakes
|
||||
rsync
|
||||
nix
|
||||
@ -24,9 +25,16 @@ let
|
||||
in
|
||||
(writeShellApplication {
|
||||
name = "nixos-anywhere";
|
||||
text = builtins.readFile ./nixos-anywhere.sh;
|
||||
# We prefer the system's openssh over our own, since it might come with features not present in ours:
|
||||
# https://github.com/numtide/nixos-anywhere/issues/62
|
||||
text = ''
|
||||
export PATH=$PATH:${lib.getBin openssh}
|
||||
${builtins.readFile ./nixos-anywhere.sh}
|
||||
'';
|
||||
inherit runtimeInputs;
|
||||
}) // {
|
||||
# also expose this attribute to other derivations
|
||||
inherit runtimeInputs;
|
||||
# Dependencies for our devshell
|
||||
devShell = mkShellNoCC {
|
||||
packages = runtimeInputs ++ [ openssh ];
|
||||
};
|
||||
}
|
||||
|
@ -4,8 +4,6 @@
|
||||
nixos-anywhere = pkgs.callPackage ./. { };
|
||||
default = config.packages.nixos-anywhere;
|
||||
};
|
||||
devShells.default = pkgs.mkShellNoCC {
|
||||
packages = config.packages.nixos-anywhere.runtimeInputs;
|
||||
};
|
||||
devShells.default = config.packages.nixos-anywhere.devShell;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user