shipwright: update to apple-sdk pattern

NixOS · Nov 1, 2024 · 0413635 · 0413635
1 parent 3ff8deb
commit 0413635
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix
@@ -25,12 +25,9 @@
 , zenity
 , makeWrapper
 , darwin
+, apple-sdk_11
 , libicns
 }:
-let
-  inherit (darwin.apple_sdk_11_0.frameworks)
-    IOSurface Metal QuartzCore Cocoa AVFoundation;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shipwright";
   version = "8.0.6";
@@ -85,14 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXext
     libpulseaudio
     zenity
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    IOSurface
-    Metal
-    QuartzCore
-    Cocoa
-    AVFoundation
-    darwin.apple_sdk_11_0.libs.simd
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
 
   cmakeFlags = [
     (lib.cmakeBool "NON_PORTABLE" true)

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