From c6f44ea7ffa486fbb39a5e59b0028344f912d621 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 15 Nov 2020 15:17:13 +0100
Subject: [PATCH] installer: handle apfs.util on macOS 11.0 Big Sur

The flages of apfs.util changed in 11.0 so try both cases.

Fixes #249
---
 modules/system/checks.nix               | 1 +
 pkgs/darwin-installer/configuration.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/system/checks.nix b/modules/system/checks.nix
index 7129f9c..22a4d86 100644
--- a/modules/system/checks.nix
+++ b/modules/system/checks.nix
@@ -29,6 +29,7 @@ let
             echo >&2
             echo "$ echo "run\tprivate/var/run" | sudo tee -a /etc/synthetic.conf" >&2
             echo "$ /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B" >&2
+            echo "$ /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t" >&2
             echo >&2
             echo "The current contents of /etc/synthetic.conf is:" >&2
             echo >&2
diff --git a/pkgs/darwin-installer/configuration.nix b/pkgs/darwin-installer/configuration.nix
index d7b575a..d8ae89e 100644
--- a/pkgs/darwin-installer/configuration.nix
+++ b/pkgs/darwin-installer/configuration.nix
@@ -68,6 +68,7 @@ with lib;
                   echo "setting up /etc/synthetic.conf..."
                   echo -e "run\tprivate/var/run" | sudo tee -a /etc/synthetic.conf >/dev/null
                   /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B 2>/dev/null || true
+                  /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t 2>/dev/null || true
               fi
               if ! test -L /run; then
                   echo "setting up /run..."