diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-07 15:44:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 15:44:21 -0600 |
| commit | 3cfdf8eb239637bdb89c443c60f5e0c9443bbf02 (patch) | |
| tree | 5c8bfa770cd4df0f8fb11b13d627dac69d747486 /pkgs/os-specific | |
| parent | cecec1f74468766825c2ad32d8388c2ded36225f (diff) | |
| parent | ed6148726b9e9b2f6edf38e889dc39c28648dda4 (diff) | |
Merge pull request #53539 from matthewbauer/darwin-fixes4
Fixes for recent darwin changes
Diffstat (limited to 'pkgs/os-specific')
5 files changed, 10 insertions, 8 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 7b1492799ddb6..45912041a24c6 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/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index 0f46e50de3a0d..08c7a883502d1 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -18,14 +18,16 @@ appleDerivation { cp xnu-*/bsd/i386/disklabel.h i386 cp -r xnu-*/bsd/sys System cp -r Libc-*/uuid System + substituteInPlace diskdev_cmds.xcodeproj/project.pbxproj \ + --replace 'DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";' "" ''; installPhase = '' install -D Products/Release/libdisk.a $out/lib/libdisk.a rm Products/Release/libdisk.a 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 ''; 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 c232052532215..2f5e4f542d7e1 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 8e69cb4bfa7e1..feee054c2ac8b 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 510c7154f2bc6..0ab6a41570755 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; } |