Merge pull request #3113 from PrismLauncher/update_flake_lock_action

chore(nix): adopt new darwin SDK pattern
This commit is contained in:
seth 2024-11-22 18:25:21 -05:00 committed by GitHub
commit 11e7b218d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions

12
flake.lock generated
View File

@ -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": {

View File

@ -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" ];

View File

@ -78,7 +78,7 @@ symlinkJoin {
let
runtimeLibs =
[
stdenv.cc.cc.lib
(lib.getLib stdenv.cc.cc)
## native versions
glfw3-minecraft
openal