the-distro/hydra
1
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

reproduce.tt: Use -I instead of $NIX_PATH

Browse source
This commit is contained in:
Eelco Dolstra 2015-05-26 16:07:00 +02:00
parent b8a0956443
commit f5ecb7a81a
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/root/reproduce.tt
View file

@ -66,8 +66,6 @@ EOF
done done
export NIX_PATH=
mkdir -p "$tmpDir" mkdir -p "$tmpDir"
cd "$tmpDir" cd "$tmpDir"
info "storing inputs and results in $tmpDir..." info "storing inputs and results in $tmpDir..."
@ -85,7 +83,7 @@ requireCommand() {
# Fetch the inputs. # Fetch the inputs.
[% inputs = build.inputs.size > 0 ? build.inputs : eval.jobsetevalinputs %] [% inputs = build.inputs ? build.inputs : eval.jobsetevalinputs %]
[%+ FOREACH input IN inputs %] [%+ FOREACH input IN inputs %]
inputDir= inputDir=
@ -167,7 +165,7 @@ nixExprInputDir="$inputDir"
[%+ END %] [%+ END %]
if [ -n "$inputDir" ]; then if [ -n "$inputDir" ]; then
NIX_PATH="$NIX_PATH${NIX_PATH:+:}[% input.name %]=$inputDir" args+=(-I [% input.name %]=$inputDir)
fi fi
[%+ END %] [%+ END %]
@ -191,7 +189,6 @@ args+=(--option extra-binary-caches '[% c.uri_for('/') %]')
args+=(--option system x86_64-linux) args+=(--option system x86_64-linux)
info "running nix-build..." info "running nix-build..."
echo "Nix path is $NIX_PATH" >&2 echo "using these flags: ${args[@]}" >&2
echo "Nix args are ${args[@]}" >&2
exec nix-build "$nixExprInputDir/[% build.nixexprpath %]" -A '[% build.job.name %]' "${args[@]}" "${extraArgs[@]}" exec nix-build "$nixExprInputDir/[% build.nixexprpath %]" -A '[% build.job.name %]' "${args[@]}" "${extraArgs[@]}"