diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-06 22:31:21 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-06 22:34:19 -0600 |
| commit | ed6148726b9e9b2f6edf38e889dc39c28648dda4 (patch) | |
| tree | 3144a2d7f4ac45ca5387cf9a866005212e8ee089 /pkgs/os-specific/darwin | |
| parent | d02bb3c1978f96259a98efcb0f280b973c756cd0 (diff) | |
| download | nixlib-ed6148726b9e9b2f6edf38e889dc39c28648dda4.tar nixlib-ed6148726b9e9b2f6edf38e889dc39c28648dda4.tar.gz nixlib-ed6148726b9e9b2f6edf38e889dc39c28648dda4.tar.bz2 nixlib-ed6148726b9e9b2f6edf38e889dc39c28648dda4.tar.lz nixlib-ed6148726b9e9b2f6edf38e889dc39c28648dda4.tar.xz nixlib-ed6148726b9e9b2f6edf38e889dc39c28648dda4.tar.zst nixlib-ed6148726b9e9b2f6edf38e889dc39c28648dda4.zip | |
darwin: fix more *_cmds derivation
Doh
Diffstat (limited to 'pkgs/os-specific/darwin')
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 7b1492799ddb..45912041a24c 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 c23205253221..2f5e4f542d7e 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 8e69cb4bfa7e..feee054c2ac8 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 510c7154f2bc..0ab6a4157075 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; } |