on master help sign in
nix-bundle.sh: Fix a bug where the wrong nix build out-link was read
8a7793bhaslersn
nix-bundle.sh+6−3
@@ -115,18 +115,21 @@ extra_target_paths=
115for target in "${targets[@]}"
115for target in "${targets[@]}"
116do
116do
117 nix build "${build_flags[@]}" "$target" || exit $?
117 nix build "${build_flags[@]}" "$target" || exit $?
118+ out_link="$linkdir/$(ls "$linkdir")"
118 if [ -z "$target_path" ]
119 if [ -z "$target_path" ]
119 then
120 then
120− target_path="$(readlink "$linkdir/result")"
121+ target_path="$(readlink "$out_link")"
121 else
122 else
122− extra_target_paths="$extra_target_paths $(readlink "$linkdir/result")"
123+ extra_target_paths="$extra_target_paths $(readlink "$out_link")"
123 fi
124 fi
125+ rm "$out_link"
124done
126done
125
127
126if [ -z "$target_path" ]
128if [ -z "$target_path" ]
127then
129then
128 nix build "${build_flags[@]}" || exit $?
130 nix build "${build_flags[@]}" || exit $?
131+ out_link="$(ls "$linkdir")"
129− target_path="$(readlink "$linkdir/result")"
132+ target_path="$(readlink "$out_link")"
130fi
133fi
131
134
132# Apply default for --bin
135# Apply default for --bin