From 04136354eed10cdbaef13372c0e1177b6e507c89 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 31 Oct 2024 21:46:10 +0000 Subject: [PATCH] shipwright: update to apple-sdk pattern --- pkgs/games/shipwright/default.nix | 14 ++------------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index 2ff8c063f5f0..ee23cbc332bf 100644 --- 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 index 1be062581944..a01095f63f40 100644 --- 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;