diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-03 18:02:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-03 18:02:18 +0000 |
commit | 2a54df094687c557220b593d3d3d762b8beb092c (patch) | |
tree | adafe2c522ea057b83d21a3f00952e49b07350ec /pkgs/stdenv | |
parent | e394618ccf62b4b7dc3107b5be2b4f10ee394fae (diff) | |
parent | a5d9b96ab1c85440a1872b929b495f4afd832b42 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index da4a94e34b01a..5e549e48287c5 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -105,16 +105,16 @@ in rec { mkdir $out/include cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include - ${lib.optionalString targetPlatform.isAarch64 '' - # copy .tbd assembly utils - cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin - cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib + # copy .tbd assembly utils + cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin + cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib - # copy package extraction tools - cp -d ${pkgs.pbzx}/bin/pbzx $out/bin - cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib - cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib + # copy package extraction tools + cp -d ${pkgs.pbzx}/bin/pbzx $out/bin + cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib + cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib + ${lib.optionalString targetPlatform.isAarch64 '' # copy sigtool cp -d ${pkgs.darwin.sigtool}/bin/sigtool $out/bin cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin |