ilyakooo0/nix-bundle
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nix-bundle.git synced 2024-08-16 02:10:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

nix-bundle.sh: Fix a bug where the wrong nix build out-link was read

Browse Source
This commit is contained in:
haslersn 2019-06-25 23:28:12 +02:00
parent 138ff3a395
commit 8a7793bf7a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nix-bundle.sh
View File

@ -115,18 +115,21 @@ extra_target_paths=
for target in "${targets[@]}"
do
nix build "${build_flags[@]}" "$target" || exit $?
out_link="$linkdir/$(ls "$linkdir")"
if [ -z "$target_path" ]
then
target_path="$(readlink "$linkdir/result")"
target_path="$(readlink "$out_link")"
else
extra_target_paths="$extra_target_paths $(readlink "$linkdir/result")"
extra_target_paths="$extra_target_paths $(readlink "$out_link")"
fi
rm "$out_link"
done
if [ -z "$target_path" ]
then
nix build "${build_flags[@]}" || exit $?
target_path="$(readlink "$linkdir/result")"
out_link="$(ls "$linkdir")"
target_path="$(readlink "$out_link")"
fi
# Apply default for --bin