From c0571befc9187f74e9f8376ed238382fd87fac36 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Tue, 19 Dec 2023 15:17:41 +0300
Subject: [PATCH 1/2] fix(build): Adjust macfonts module to more robustly
 import AppKit

---
 build-aux/pkg.nix     | 2 --
 justenough/macfonts.m | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build-aux/pkg.nix b/build-aux/pkg.nix
index 2b53be20d..9f6380360 100644
--- a/build-aux/pkg.nix
+++ b/build-aux/pkg.nix
@@ -118,8 +118,6 @@ in stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs build-aux/*.sh build-aux/git-version-gen
-  '' + lib.optionalString stdenv.isDarwin ''
-    sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m
   '';
 
   NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit";
diff --git a/justenough/macfonts.m b/justenough/macfonts.m
index d63850d47..0596a144f 100644
--- a/justenough/macfonts.m
+++ b/justenough/macfonts.m
@@ -1,4 +1,5 @@
-@import AppKit;
+#import <AppKit/AppKit.h>
+
 #include <stdio.h>
 #include <lua.h>
 #include <lauxlib.h>

From b6a79676f541a8ece79ec180e2c2a1860e9f4723 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Tue, 19 Dec 2023 15:23:57 +0300
Subject: [PATCH 2/2] chore(build): Drop obsolete Nix flake workaround

---
 build-aux/pkg.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/build-aux/pkg.nix b/build-aux/pkg.nix
index 9f6380360..0be09f536 100644
--- a/build-aux/pkg.nix
+++ b/build-aux/pkg.nix
@@ -138,15 +138,6 @@ in stdenv.mkDerivation (finalAttrs: {
     touch source/build-aux/rust_boilerplate.mk
   '';
 
-  # remove forbidden references to $TMPDIR
-  preFixup = lib.optionalString stdenv.isLinux ''
-    for f in "$out"/bin/*; do
-      if isELF "$f"; then
-        patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
-      fi
-    done
-  '';
-
   passthru = {
     # So it will be easier to inspect this environment, in comparison to others
     inherit luaEnv;