diff options
| author | Vincent Ambo <tazjin@google.com> | 2019-09-29T21·58+0100 |
|---|---|---|
| committer | Vincent Ambo <github@tazj.in> | 2019-10-03T12·21+0100 |
| commit | 0898d8a96175958b82d1713d13304423f8b19f77 (patch) | |
| tree | 9e4c1f454dd2d4fe32efe825740aeb504bd7678d /tools/nixery/build-image/build-image.nix | |
| parent | 712b38cbbcb5671135dbf04492de3c4e97fa1b87 (diff) | |
chore(build-image): Simplify wrapper build & remove layer grouping
Simplifies the wrapper script used to invoke Nix builds from Nixery to just contain the essentials, since the layer grouping logic is moving into the server itself.
Diffstat (limited to 'tools/nixery/build-image/build-image.nix')
| -rw-r--r-- | tools/nixery/build-image/build-image.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/nixery/build-image/build-image.nix b/tools/nixery/build-image/build-image.nix index 1d97ba59b97d..33500dbb9e80 100644 --- a/tools/nixery/build-image/build-image.nix +++ b/tools/nixery/build-image/build-image.nix @@ -26,6 +26,8 @@ srcType ? "nixpkgs", srcArgs ? "nixos-19.03", importArgs ? { }, + # Path to load-pkgs.nix + loadPkgs ? ./load-pkgs.nix, # Packages to install by name (which must refer to top-level attributes of # nixpkgs). This is passed in as a JSON-array in string form. packages ? "[]" @@ -43,7 +45,7 @@ let inherit (pkgs) lib runCommand writeText; - pkgs = import ./load-pkgs.nix { inherit srcType srcArgs importArgs; }; + pkgs = import loadPkgs { inherit srcType srcArgs importArgs; }; # deepFetch traverses the top-level Nix package set to retrieve an item via a # path specified in string form. |