greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#452: makeShell: use final system configuration in generate-secrets

Browse Source 
1af84e8b7e makeShell: use actual system configuration in `generate-secrets` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 1af84e8b7e

Tree-SHA512: d4d2808f627d45e152b2ae7224ccdadd93e727066086cf9dfe3c6ee674773da556e7c8a077794d6dc8f1df4f2a1a41c4f3abfbb3c7ebaca70d8152cd53295ab6
This commit is contained in:
Jonas Nick 2022-02-12 20:49:55 +00:00
commit 827107c807
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helper/makeShell.nix
View File

@ -77,7 +77,11 @@ pkgs.stdenv.mkDerivation {
generate-secrets() {( generate-secrets() {(
set -euo pipefail 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) '<nixpkgs/nixos>' -A config.nix-bitcoin.generateSecretsScript)
mkdir -p "${cfgDir}/secrets" mkdir -p "${cfgDir}/secrets"
(cd "${cfgDir}/secrets"; $genSecrets) (cd "${cfgDir}/secrets"; $genSecrets)