From 41db87c8cf02c41e1aae6a0b4a7794ef47f123cb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 22:26:01 +0000
Subject: [PATCH 1/2] chore(nix): update lockfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nix-filter':
    'github:numtide/nix-filter/776e68c1d014c3adde193a18db9d738458cd2ba4?narHash=sha256-SCHiL%2B1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I%3D' (2024-10-29)
  → 'github:numtide/nix-filter/f7653272fd234696ae94229839a99b73c9ab7de0?narHash=sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms%3D' (2024-11-13)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7?narHash=sha256-Zwl8YgTVJTEum%2BL%2B0zVAWvXAGbWAuXHax3KzuejaDyo%3D' (2024-11-05)
  → 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index e599acaef..ba9a56c33 100644
--- a/flake.lock
+++ b/flake.lock
@@ -34,11 +34,11 @@
     },
     "nix-filter": {
       "locked": {
-        "lastModified": 1730207686,
-        "narHash": "sha256-SCHiL+1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I=",
+        "lastModified": 1731533336,
+        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
         "owner": "numtide",
         "repo": "nix-filter",
-        "rev": "776e68c1d014c3adde193a18db9d738458cd2ba4",
+        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
         "type": "github"
       },
       "original": {
@@ -49,11 +49,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
         "type": "github"
       },
       "original": {

From fbbd64ddb7a9a2de75aa2508b34db27c7c6c0459 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 22 Nov 2024 17:32:52 -0500
Subject: [PATCH 2/2] chore(nix): sync with upstream nixpkgs

Signed-off-by: seth <getchoo@tuta.io>
---
 nix/unwrapped.nix | 4 ++--
 nix/wrapper.nix   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nix/unwrapped.nix b/nix/unwrapped.nix
index 1b14886ef..7ba20b68b 100644
--- a/nix/unwrapped.nix
+++ b/nix/unwrapped.nix
@@ -3,7 +3,7 @@
   stdenv,
   cmake,
   cmark,
-  darwin,
+  apple-sdk_11,
   extra-cmake-modules,
   gamemode,
   ghc_filesystem,
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
       tomlplusplus
       zlib
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
     ++ lib.optional gamemodeSupport gamemode;
 
   hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
diff --git a/nix/wrapper.nix b/nix/wrapper.nix
index ab9b7144b..03c1f0421 100644
--- a/nix/wrapper.nix
+++ b/nix/wrapper.nix
@@ -78,7 +78,7 @@ symlinkJoin {
     let
       runtimeLibs =
         [
-          stdenv.cc.cc.lib
+          (lib.getLib stdenv.cc.cc)
           ## native versions
           glfw3-minecraft
           openal