From 1af84e8b7e47b54126d23078e4d381dcffde2883 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sat, 12 Feb 2022 21:22:59 +0100
Subject: [PATCH] makeShell: use actual system configuration in
 `generate-secrets`

This fixes a bug where the version update message for v0.0.65 is erroneously triggered
because the krops config is not included when evaluating secrets.
---
 helper/makeShell.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/helper/makeShell.nix b/helper/makeShell.nix
index 7dd93fb..456784d 100644
--- a/helper/makeShell.nix
+++ b/helper/makeShell.nix
@@ -77,7 +77,11 @@ pkgs.stdenv.mkDerivation {
 
     generate-secrets() {(
       set -euo pipefail
-      genSecrets=$(nix-build --no-out-link -I nixos-config="${cfgDir}/configuration.nix" \
+      config="${cfgDir}/krops/krops-configuration.nix"
+      if [[ ! -e $config ]]; then
+        config="${cfgDir}/configuration.nix"
+      fi
+      genSecrets=$(nix-build --no-out-link -I nixos-config="$config" \
                    '<nixpkgs/nixos>' -A config.nix-bitcoin.generateSecretsScript)
       mkdir -p "${cfgDir}/secrets"
       (cd "${cfgDir}/secrets"; $genSecrets)