From ed6148726b9e9b2f6edf38e889dc39c28648dda4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 6 Jan 2019 22:31:21 -0600
Subject: [PATCH] darwin: fix more *_cmds derivation

Doh
---
 .../darwin/apple-source-releases/adv_cmds/xcode.nix           | 3 ++-
 .../darwin/apple-source-releases/file_cmds/default.nix        | 4 ++--
 .../darwin/apple-source-releases/network_cmds/default.nix     | 2 +-
 pkgs/os-specific/darwin/insert_dylib/default.nix              | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
index 7b1492799dd..45912041a24 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
@@ -16,7 +16,8 @@ appleDerivation {
     substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
       --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \
       --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \
-      --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib'
+      --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib' \
+      --replace 'DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";' ""
   '';
 
   buildPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
index c2320525322..2f5e4f542d7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
@@ -21,8 +21,8 @@ appleDerivation rec {
   installPhase = ''
     for f in Products/Release/*; do
       if [ -f $f ]; then
-        install -D $file $out/bin/$(basename $f)
-      done
+        install -D $f $out/bin/$(basename $f)
+      fi
     done
 
     for n in 1; do
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 8e69cb4bfa7..feee054c2ac 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -22,7 +22,7 @@ appleDerivation rec {
   installPhase = ''
     for f in Products/Release/*; do
       if [ -f $f ]; then
-        install -D $file $out/bin/$(basename $f)
+        install -D $f $out/bin/$(basename $f)
       fi
     done
 
diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix
index 510c7154f2b..0ab6a415707 100644
--- a/pkgs/os-specific/darwin/insert_dylib/default.nix
+++ b/pkgs/os-specific/darwin/insert_dylib/default.nix
@@ -11,9 +11,8 @@ stdenv.mkDerivation
     nativeBuildInputs = [ xcbuildHook ];
     installPhase =
       ''
-        prog=$(find . -type f -name insert_dylib)
         mkdir -p $out/bin
-        install -m755 $prog $out/bin
+        install -m755 Products/Release/insert_dylib $out/bin
       '';
     meta.platforms = stdenv.lib.platforms.darwin;
   }