From ef2623d168fc3f91020fdb574f5287b01d7534e6 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 1 Oct 2019 23:25:51 +0100
Subject: [PATCH] fix(nix): Minor fixes to derivations for new build process

---
 tools/nixery/build-image/build-layers.nix | 2 +-
 tools/nixery/default.nix                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/nixery/build-image/build-layers.nix b/tools/nixery/build-image/build-layers.nix
index 8a8bfbe9e..9a8742f13 100644
--- a/tools/nixery/build-image/build-layers.nix
+++ b/tools/nixery/build-image/build-layers.nix
@@ -25,7 +25,7 @@
 
 let
   inherit (builtins) fromJSON mapAttrs toJSON;
-  inherit (pkgs) lib runCommand;
+  inherit (pkgs) lib runCommand writeText;
 
   pkgs = import loadPkgs { inherit srcType srcArgs importArgs; };
 
diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index 925edbf6d..af506eea3 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -44,7 +44,7 @@ in rec {
   # are installing Nixery directly.
   nixery-bin = writeShellScriptBin "nixery" ''
     export WEB_DIR="${nixery-book}"
-    export PATH="${nixery-build-image}/bin:$PATH"
+    export PATH="${nixery-build-layers}/bin:${nixery-build-image}/bin:$PATH"
     exec ${nixery-server}/bin/nixery
   '';
 
@@ -96,6 +96,7 @@ in rec {
       iana-etc
       nix
       nixery-build-image
+      nixery-build-layers
       nixery-launch-script
       openssh
       zlib