Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-29 05:10:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3113 from PrismLauncher/update_flake_lock_action

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

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

4
nix/unwrapped.nix
View File

@ -3,7 +3,7 @@
stdenv, stdenv,
cmake, cmake,
cmark, cmark,
darwin, apple-sdk_11,
extra-cmake-modules, extra-cmake-modules,
gamemode, gamemode,
ghc_filesystem, ghc_filesystem,
@ -66,7 +66,7 @@ stdenv.mkDerivation {
tomlplusplus tomlplusplus
zlib zlib
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
++ lib.optional gamemodeSupport gamemode; ++ lib.optional gamemodeSupport gamemode;
hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ]; hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];

2
nix/wrapper.nix
View File

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