Merge pull request #114944 from thefloweringash/darwin-arch-fixup

darwin.bootstrap_cmds: use correct arch in "mig"
This commit is contained in:
Sandro 2021-03-03 13:02:37 +01:00 committed by GitHub
commit b29295dc63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ lib, appleDerivation, yacc, flex }: { lib, stdenv, appleDerivation, yacc, flex }:
appleDerivation { appleDerivation {
nativeBuildInputs = [ yacc flex ]; nativeBuildInputs = [ yacc flex ];
@ -26,7 +26,7 @@ appleDerivation {
cp migcom.1 $out/share/man/man1 cp migcom.1 $out/share/man/man1
substituteInPlace $out/bin/mig \ substituteInPlace $out/bin/mig \
--replace 'arch=`/usr/bin/arch`' 'arch=i386' \ --replace 'arch=`/usr/bin/arch`' 'arch=${stdenv.targetPlatform.darwinArch}' \
--replace '/usr/bin/' "" \ --replace '/usr/bin/' "" \
--replace '/bin/rmdir' "rmdir" \ --replace '/bin/rmdir' "rmdir" \
--replace 'C=''${MIGCC}' "C=cc" --replace 'C=''${MIGCC}' "C=cc"