Skip to content

Commit

Permalink
shell.nix: fix failing generate-secrets
Browse files Browse the repository at this point in the history
generate-secrets failed due to the `PYTHONPATH` env var that was set
through the nixops19_09 buildInput.

Fixes:
- Don't pull in the build environments of binaries that should be
  available in PATH. Only extend PATH instead.
- Run generate-secrets in an empty environment
  • Loading branch information
erikarvstedt committed Oct 19, 2020
1 parent 06cba7b commit d2dbad2
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions examples/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ with nixpkgs;
stdenv.mkDerivation rec {
name = "nix-bitcoin-environment";

buildInputs = [ nix-bitcoin.nixops19_09 nix-bitcoin.extra-container figlet ];
path = lib.makeBinPath [ nix-bitcoin.nixops19_09 nix-bitcoin.extra-container figlet ];

shellHook = ''
export NIX_PATH="nixpkgs=${nixpkgs-path}:nix-bitcoin=${toString nix-bitcoin-path}:."
export PATH="${path}''${PATH:+:}$PATH"
alias fetch-release="${toString nix-bitcoin-path}/helper/fetch-release"
# ssh-agent and nixops don't play well together (see
Expand All @@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
export SSH_AUTH_SOCK=""
figlet "nix-bitcoin"
(mkdir -p secrets; cd secrets; ${nix-bitcoin.generate-secrets})
(mkdir -p secrets; cd secrets; env -i ${nix-bitcoin.generate-secrets})
# Don't run this hook when another nix-shell is run inside this shell
unset shellHook
Expand Down

0 comments on commit d2dbad2

Please sign in to comment.