* Flag `--no-link' suppresses symlinking to the output path.

* Handle multiple derivations correctly.

1 files changed, 19 insertions, 11 deletions

diff --git a/scripts/nix-build.in b/scripts/nix-build.in
index 321add884f24..9ae5a0edebfe 100755
--- a/scripts/nix-build.in
+++ b/scripts/nix-build.in
@@ -8,27 +8,35 @@ if test -z "$nixExpr"; then
 fi
 
 extraArgs=
+noLink=
 
 for i in "$@"; do
     case "$i" in
+        --no-link)
+            noLink=1
+            ;;
         -*)
             extraArgs="$extraArgs $i"
             ;;
         *)
-            storeExpr=$(nix-instantiate "$i")
-            for j in $storeExpr; do
+            storeExprs=$(nix-instantiate "$i")
+            for j in $storeExprs; do
                 echo "store expression is $j" >&2
             done
-            outPath=$(nix-store -qnfv $extraArgs $storeExpr)
-            echo $outPath
-            if test -e result; then
-                if ! test -L result; then
-                    echo "cannot remove \`result\' (not a symlink)"
-                    exit 1
+            outPaths=$(nix-store -qnfv $extraArgs $storeExprs)
+            for j in $outPaths; do
+                echo "$j"
+                if test -z "$noLink"; then
+                    if test -e result; then
+                        if ! test -L result; then
+                            echo "cannot remove \`result\' (not a symlink)"
+                            exit 1
+                        fi
+                        rm result
+                    fi
+                    ln -s "$j" result
                 fi
-                rm result
-            fi
-            ln -s $outPath result
+            done
             ;;
     esac
 done