From 8a7793bf7aa9eab73b634909c32312bae0a7ea53 Mon Sep 17 00:00:00 2001
From: haslersn <sebastian.hasler@gmx.net>
Date: Tue, 25 Jun 2019 23:28:12 +0200
Subject: [PATCH] nix-bundle.sh: Fix a bug where the wrong nix build out-link
 was read

---
 nix-bundle.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nix-bundle.sh b/nix-bundle.sh
index 2e47586..3f81735 100755
--- a/nix-bundle.sh
+++ b/nix-bundle.sh
@@ -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