about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-10-01T22·25+0100
committerVincent Ambo <github@tazj.in>2019-10-03T12·21+0100
commitef2623d168fc3f91020fdb574f5287b01d7534e6 (patch)
tree96cab42a236cea8c9cb2988d8b5418dae337a541
parent3f40c0a2d2e9ca03253da13ec53bc57e9c524f00 (diff)
fix(nix): Minor fixes to derivations for new build process
-rw-r--r--tools/nixery/build-image/build-layers.nix2
-rw-r--r--tools/nixery/default.nix3
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 8a8bfbe9edf1..9a8742f13f73 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 925edbf6dc84..af506eea32d2 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