Merge pull request #109518 from xaverdh/nixos-rebuild-deps

nixos-rebuild: put some important dependencies in PATH
This commit is contained in:
Domen Kožar 2021-01-16 22:20:07 +01:00 committed by GitHub
commit bb3e0885d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,8 +1,16 @@
{ substituteAll, runtimeShell, jq, nix, lib }: { substituteAll
, runtimeShell
, coreutils
, gnused
, gnugrep
, jq
, nix
, lib
}:
let let
fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix; fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
in substituteAll { in
substituteAll {
name = "nixos-rebuild"; name = "nixos-rebuild";
src = ./nixos-rebuild.sh; src = ./nixos-rebuild.sh;
dir = "bin"; dir = "bin";
@ -10,5 +18,5 @@ in substituteAll {
inherit runtimeShell nix; inherit runtimeShell nix;
nix_x86_64_linux = fallback.x86_64-linux; nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux; nix_i686_linux = fallback.i686-linux;
path = lib.makeBinPath [ jq ]; path = lib.makeBinPath [ coreutils jq gnused gnugrep ];
} }