diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-06 16:07:24 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-06 16:07:47 +0200 |
| commit | 1fef99942e47e9e9e37e6c4f16726d2ce85a3eef (patch) | |
| tree | 8a3f555c8ab7ec2e75415fc15be81b65b949fe2e /nixos/modules/installer/tools/tools.nix | |
| parent | 5cbfbb1553e02c27c40387130384019652dcce2b (diff) | |
| download | nixpkgs-1fef99942e47e9e9e37e6c4f16726d2ce85a3eef.tar nixpkgs-1fef99942e47e9e9e37e6c4f16726d2ce85a3eef.tar.gz nixpkgs-1fef99942e47e9e9e37e6c4f16726d2ce85a3eef.tar.bz2 nixpkgs-1fef99942e47e9e9e37e6c4f16726d2ce85a3eef.tar.lz nixpkgs-1fef99942e47e9e9e37e6c4f16726d2ce85a3eef.tar.xz nixpkgs-1fef99942e47e9e9e37e6c4f16726d2ce85a3eef.tar.zst nixpkgs-1fef99942e47e9e9e37e6c4f16726d2ce85a3eef.zip | |
nixos-rebuild: Move the Nix fallback store paths into a separate file
Diffstat (limited to 'nixos/modules/installer/tools/tools.nix')
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index fc39a653abd..a35f6ad8ae5 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -32,11 +32,15 @@ let "cp refs $out"; }; - nixos-rebuild = makeProg { - name = "nixos-rebuild"; - src = ./nixos-rebuild.sh; - nix = config.nix.package.out; - }; + nixos-rebuild = + let fallback = import ./nix-fallback-paths.nix; in + makeProg { + name = "nixos-rebuild"; + src = ./nixos-rebuild.sh; + nix = config.nix.package.out; + nix_x86_64_linux = fallback.x86_64-linux; + nix_i686_linux = fallback.i686-linux; + }; nixos-generate-config = makeProg { name = "nixos-generate-config"; |