From f5c6692c0dacbfa1836d1274715d312c69426462 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Wed, 2 Dec 2020 23:49:16 +0100 Subject: [PATCH] Fix toolchain --- tmp/default.do | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tmp/default.do b/tmp/default.do index afb949a..38300ad 100644 --- a/tmp/default.do +++ b/tmp/default.do @@ -3,15 +3,17 @@ exec >&2 +pfx=${2%.rw} + redo-ifchange ../flake.nix ../flake.lock || true resolve_flake() { - STORE_PATH=$(nix flake info --json --inputs-from .. "$2" | jq -r .path) + STORE_PATH=$(nix flake info --json --inputs-from .. "$pfx" | jq -r .path) # Do this after 'info' to avoid unnecessary network activity. nix flake # archive may try to download a flake although the store path is available. if [ ! -d "$STORE_PATH" ]; then - nix flake archive --inputs-from .. "$2" + nix flake archive --inputs-from .. "$pfx" fi }