shipwright: update to apple-sdk pattern

This commit is contained in:
Matteo Pacini 2024-10-31 21:46:10 +00:00
parent 3ff8deb4c1
commit 04136354ee
2 changed files with 3 additions and 15 deletions

View File

@ -25,12 +25,9 @@
, zenity , zenity
, makeWrapper , makeWrapper
, darwin , darwin
, apple-sdk_11
, libicns , libicns
}: }:
let
inherit (darwin.apple_sdk_11_0.frameworks)
IOSurface Metal QuartzCore Cocoa AVFoundation;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "shipwright"; pname = "shipwright";
version = "8.0.6"; version = "8.0.6";
@ -85,14 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
libXext libXext
libpulseaudio libpulseaudio
zenity zenity
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
IOSurface
Metal
QuartzCore
Cocoa
AVFoundation
darwin.apple_sdk_11_0.libs.simd
];
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "NON_PORTABLE" true) (lib.cmakeBool "NON_PORTABLE" true)

View File

@ -34088,9 +34088,7 @@ with pkgs;
keeperrl = callPackage ../games/keeperrl { }; keeperrl = callPackage ../games/keeperrl { };
shipwright = callPackage ../games/shipwright { shipwright = callPackage ../games/shipwright { };
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
wipeout-rewrite = callPackage ../games/wipeout-rewrite { wipeout-rewrite = callPackage ../games/wipeout-rewrite {
inherit (darwin.apple_sdk.frameworks) Foundation; inherit (darwin.apple_sdk.frameworks) Foundation;