From 4d2a8257edc33f03fc4bb26ff32f9db1d96c7d95 Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Wed, 19 Feb 2020 20:31:14 -0500
Subject: [PATCH 1/2] plan9port: fix linker flags for macosx

---
 pkgs/tools/system/plan9port/builder.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index f5c447ea0a5..57716614a13 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -8,13 +8,20 @@ plan9portLinkFlags()
     local -a linkFlags=()
     eval set -- "$NIX_LDFLAGS"
     while (( $# > 0 )); do
-        if [[ $1 = -rpath ]]; then
-            linkFlags+=( "-Wl,-rpath,$2" )
+        case "$1" in
+        -rpath|-macosx_version_min|-sdk_version)
+            linkFlags+=( "-Wl,$1,$2" )
             shift 2
-        else
+            ;;
+        -no_uuid)
+            linkFlags+=( "-Wl,$1" )
+            shift
+            ;;
+        *)
             linkFlags+=( "$1" )
             shift
-        fi
+            ;;
+        esac
     done
     echo "${linkFlags[*]}"
 }

From 7724ef793adcfbbd9cd46f8836a3618687ee110d Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Thu, 20 Feb 2020 17:40:30 -0500
Subject: [PATCH 2/2] plan9port: wrap ALL linker flags

---
 pkgs/tools/system/plan9port/builder.sh | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 57716614a13..7750de70061 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -5,25 +5,11 @@ export PLAN9_TARGET=$PLAN9
 
 plan9portLinkFlags()
 {
-    local -a linkFlags=()
     eval set -- "$NIX_LDFLAGS"
-    while (( $# > 0 )); do
-        case "$1" in
-        -rpath|-macosx_version_min|-sdk_version)
-            linkFlags+=( "-Wl,$1,$2" )
-            shift 2
-            ;;
-        -no_uuid)
-            linkFlags+=( "-Wl,$1" )
-            shift
-            ;;
-        *)
-            linkFlags+=( "$1" )
-            shift
-            ;;
-        esac
+    local flag
+    for flag in "$@"; do
+        printf ' -Wl,%s' "$flag"
     done
-    echo "${linkFlags[*]}"
 }
 
 configurePhase()