diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-22 20:53:42 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-22 20:53:42 +0200 |
| commit | 06f2f92476efea4f75457b937a1d60bb4d347c12 (patch) | |
| tree | 80ff1d1091686d7bbf6ea93c56492f2e720d8ed1 | |
| parent | 96bc68be7d36d790bb9badf7a516760d8050e187 (diff) | |
| parent | 67bfd42d630e0d72bbee91931fbfae4f79d309c3 (diff) | |
Merge branch 'staging/make-fix'
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | krebs/4lib/infest/prepare.sh | 2 |
2 files changed, 8 insertions, 2 deletions
@@ -102,7 +102,13 @@ ifneq ($(ssh),) populate: populate-flags += --ssh=$(ssh) endif populate: - $(call evaluate,config.krebs.build.source) --json --strict | \ + nix-instantiate \ + --eval \ + --json \ + --readonly-mode \ + --show-trace \ + --strict \ + $(LOGNAME)/1systems/$(system)/source.nix | \ populate $(populate-target) $(populate-flags) # usage: make pkgs.populate diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh index 50d521e17..d39aca348 100644 --- a/krebs/4lib/infest/prepare.sh +++ b/krebs/4lib/infest/prepare.sh @@ -102,7 +102,7 @@ prepare_nixos_iso() { mkdir -p bin rm -f bin/nixos-install cp "$(type -p nixos-install)" bin/nixos-install - sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install + sed -i "s@NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install } get_nixos_install() { |