From 344da0415c71a6bb73a556c312f420e670da170b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 17 Feb 2023 04:22:08 +0000
Subject: [PATCH 1/2] Use newer prebuilt rustc and disable stack check to fix
 build

Newer stack check doesn't work with LLVM 15.
---
 default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 3f3e1c1..8393ff2 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
 rec {
-  alamgu = import ./dep/alamgu {};
+  alamgu = import ./dep/alamgu { backend = "mozilla"; };
 
   inherit (alamgu) lib pkgs crate2nix alamguLib;
 
@@ -141,12 +141,14 @@ rec {
       nanox = 400000;
     }.${device} or (throw "Unknown target device: `${device}'");
 
+    /*
     stack-check = makeStackCheck { inherit memLimit rootCrate device; };
     stack-check-with-logging = makeStackCheck {
       inherit memLimit device;
       rootCrate = rootCrate-with-logging;
       variant = "-with-logging";
     };
+    */
 
     rootCrate = app.rootCrate.build;
     rootCrate-with-logging = app-with-logging.rootCrate.build;

From 0532c02c0728a5026b1e323b1dd5632e5fe8ccfe Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 22 Feb 2023 23:04:05 +0000
Subject: [PATCH 2/2] Use newer stack-check, but it crashes

---
 default.nix            | 2 --
 dep/alamgu/github.json | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index 8393ff2..083ced6 100644
--- a/default.nix
+++ b/default.nix
@@ -141,14 +141,12 @@ rec {
       nanox = 400000;
     }.${device} or (throw "Unknown target device: `${device}'");
 
-    /*
     stack-check = makeStackCheck { inherit memLimit rootCrate device; };
     stack-check-with-logging = makeStackCheck {
       inherit memLimit device;
       rootCrate = rootCrate-with-logging;
       variant = "-with-logging";
     };
-    */
 
     rootCrate = app.rootCrate.build;
     rootCrate-with-logging = app-with-logging.rootCrate.build;
diff --git a/dep/alamgu/github.json b/dep/alamgu/github.json
index 1f42b46..dd86830 100644
--- a/dep/alamgu/github.json
+++ b/dep/alamgu/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "alamgu",
   "repo": "alamgu",
-  "branch": "nixpkgs-22.11",
+  "branch": "newer-stack-check",
   "private": false,
-  "rev": "4c000dae4616d49bfbd0f4d31cd2e2fc86586020",
-  "sha256": "1mrvnsj754fqxfm9dzw3xvc8miahik50vabcrpccajw1f11wkr4w"
+  "rev": "f5f25c6ab3eb65dee0f2d5cb82353c41c30254d1",
+  "sha256": "0gn4a7nnmww59v1wparifnm761skb3g9q5ljkvp4kx5q5372azsa"
 }