Skip to content

Commit 827107c

Browse files
committed
Merge #452: makeShell: use final system configuration in generate-secrets
1af84e8 makeShell: use actual system configuration in `generate-secrets` (Erik Arvstedt) Pull request description: ACKs for top commit: jonasnick: ACK 1af84e8 Tree-SHA512: d4d2808f627d45e152b2ae7224ccdadd93e727066086cf9dfe3c6ee674773da556e7c8a077794d6dc8f1df4f2a1a41c4f3abfbb3c7ebaca70d8152cd53295ab6
2 parents 2e22bbd + 1af84e8 commit 827107c

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

helper/makeShell.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ pkgs.stdenv.mkDerivation {
7777
7878
generate-secrets() {(
7979
set -euo pipefail
80-
genSecrets=$(nix-build --no-out-link -I nixos-config="${cfgDir}/configuration.nix" \
80+
config="${cfgDir}/krops/krops-configuration.nix"
81+
if [[ ! -e $config ]]; then
82+
config="${cfgDir}/configuration.nix"
83+
fi
84+
genSecrets=$(nix-build --no-out-link -I nixos-config="$config" \
8185
'<nixpkgs/nixos>' -A config.nix-bitcoin.generateSecretsScript)
8286
mkdir -p "${cfgDir}/secrets"
8387
(cd "${cfgDir}/secrets"; $genSecrets)

0 commit comments

Comments
 (0)