Merge #317: Pkg updates
a0f48c9de9examples: fix deploy-container interactive flag (nixbitcoin)a2f265cd35secp256k1: move to top-level packages (Erik Arvstedt)d41a843167jmbitcoin: remove secp256k1 from propagatedBuildInputs (Erik Arvstedt)c22adb03afextra-container: 0.5 -> 0.6 (Erik Arvstedt) Pull request description: ACKs for top commit: nixbitcoin: ACKa0f48c9de9jonasnick: ACKa0f48c9de9Tree-SHA512: 29fa58a960673df407831dd41594c66b26dad1de1e792f4fcc8e35641f39dd873d77b725651be5e01c875bf42284fa78903bab0ea677ec5a0e7eccf98816845d
This commit is contained in:
commit
2ebd1129a5
7 changed files with 10 additions and 10 deletions
|
|
@ -77,8 +77,8 @@ while [[ $# > 0 ]]; do
|
|||
done
|
||||
|
||||
containerBin=$(type -P extra-container) || true
|
||||
if [[ ! ($containerBin && $(realpath $containerBin) == *extra-container-0.5*) ]]; then
|
||||
echo "Building extra-container. Skip this step by adding extra-container 0.5 to PATH."
|
||||
if [[ ! ($containerBin && $(realpath $containerBin) == *extra-container-0.6*) ]]; then
|
||||
echo "Building extra-container. Skip this step by adding extra-container 0.6 to PATH."
|
||||
nix-build --out-link /tmp/extra-container "$scriptDir"/../pkgs -A extra-container >/dev/null
|
||||
export PATH="/tmp/extra-container/bin${PATH:+:}$PATH"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue