From f5d3c49162d166e11fa75addb935bc857f456f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20K=C3=B6nig?= <janis.koenig@intcube.io>
Date: Sun, 4 Feb 2024 14:11:30 +0100
Subject: [PATCH 1/2] build: Add darwin aarch64 to supported architectures

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 1460368f9b..b6ea9a07a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,7 +34,7 @@
   outputs = { self, nixpkgs, filter, unblob-native, lzallright, pyperscan, sasquatch, ... }:
     let
       # System types to support.
-      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
 
       # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;

From 5df141e2509f7424a64f3e5b61f4a7ad44c550a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20K=C3=B6nig?= <janis.koenig@intcube.io>
Date: Sun, 4 Feb 2024 16:47:16 +0100
Subject: [PATCH 2/2] fix: correct pagesize in dependency simg2img

---
 overlay.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/overlay.nix b/overlay.nix
index 52e7f811f0..9e1f71c68b 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -12,6 +12,15 @@ final: prev:
       nativeCheckInputs = (super.nativeCheckInputs or [ ]) ++ [ final.which ];
     });
 
+  simg2img = prev.simg2img.overrideAttrs (super: {
+    postPatch = ''
+      substituteInPlace output_file.cpp \
+        --replace-fail \
+        'aligned_offset = offset & ~(4096 - 1);' \
+        'aligned_offset = offset & ~(sysconf(_SC_PAGESIZE) - 1);'
+    '';
+  });
+
   # Own package updated independently of nixpkgs
   jefferson = final.callPackage ./nix/jefferson { };