From fbbd64ddb7a9a2de75aa2508b34db27c7c6c0459 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 22 Nov 2024 17:32:52 -0500 Subject: [PATCH] chore(nix): sync with upstream nixpkgs Signed-off-by: seth --- 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