update Xcode and fix crash in snapUtil

This commit is contained in:
Michael Roitzsch
2021-02-22 09:37:29 +01:00
parent 7bfdb02cc9
commit c26b374f48

View File

@@ -26,7 +26,7 @@
acextract =
with import nixpkgs { system = "x86_64-darwin"; };
let xcode12 = makeSetupHook {
deps = [ (xcodeenv.composeXcodeWrapper { version = "12.3"; }) ];
deps = [ (xcodeenv.composeXcodeWrapper { version = "12.4"; }) ];
} "${xcbuildHook}/nix-support/setup-hook";
in stdenv.mkDerivation {
name = "acextract-${lib.substring 0 8 self.inputs.acextract.lastModifiedDate}";
@@ -62,7 +62,7 @@
stdenv.mkDerivation {
name = "snap-util-${lib.substring 0 8 self.inputs.snap-util.lastModifiedDate}";
src = snap-util;
nativeBuildInputs = [ (xcodeenv.composeXcodeWrapper { version = "12.3"; }) ];
nativeBuildInputs = [ (xcodeenv.composeXcodeWrapper { version = "12.4"; }) ];
preBuild = "NIX_CFLAGS_COMPILE='-idirafter ${snapshot-header}/bsd'";
installPhase = ''
mkdir -p $out/bin
@@ -70,7 +70,7 @@
cat > $out/bin/snapUtil <<- EOF
#!/bin/sh
if csrutil status | grep -Fq disabled && sysctl kern.bootargs | grep -Fq amfi_get_out_of_my_way ; then
exec -a snapUtil $out/bin/.snapUtil-wrapped "\$@"
exec -a ./snapUtil $out/bin/.snapUtil-wrapped "\$@"
else
echo 'snapUtil requires SIP and AMFI to be disabled:'
echo ' boot recovery system'