From a445fb0fc2f64d79ede52afba09260349d3113d5 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 31 Oct 2024 21:32:27 +0000 Subject: [PATCH 1/5] _86Box: update to apple-sdk pattern --- pkgs/applications/emulators/86box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index efdc4ff0d8606..f9c25f94a4ba7 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -1,6 +1,6 @@ { stdenv, - darwin, + apple-sdk_11, lib, fetchFromGitHub, cmake, @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optional enableWayland wayland ++ lib.optional enableVncRenderer libvncserver - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.libs.xpc; + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" From 799fd4111c48a55718ec679bd28dcd4dc1717600 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 31 Oct 2024 21:35:03 +0000 Subject: [PATCH 2/5] augustus: update to apple-sdk pattern --- pkgs/games/augustus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix index 5b94777dea69e..c2b116f269f26 100644 --- a/pkgs/games/augustus/default.nix +++ b/pkgs/games/augustus/default.nix @@ -7,6 +7,7 @@ SDL2_mixer, libpng, darwin, + apple-sdk_11, libicns, imagemagick, }: @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { SDL2 SDL2_mixer libpng - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall From 96424cbf209464282ee554163d5856ee25539576 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 31 Oct 2024 21:38:34 +0000 Subject: [PATCH 3/5] corsix-th: update to apple-sdk pattern --- pkgs/games/corsix-th/default.nix | 13 ++----------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/games/corsix-th/default.nix b/pkgs/games/corsix-th/default.nix index 4dee7418cb893..fd5260679ce78 100644 --- a/pkgs/games/corsix-th/default.nix +++ b/pkgs/games/corsix-th/default.nix @@ -13,10 +13,7 @@ , timidity # Darwin dependencies , libiconv -, Cocoa -, CoreVideo -, CoreMedia -, VideoToolbox +, apple-sdk_11 # Update , nix-update-script }: @@ -49,13 +46,7 @@ stdenv.mkDerivation(finalAttrs: { SDL2 SDL2_mixer timidity - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Cocoa - CoreVideo - CoreMedia - VideoToolbox - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; cmakeFlags = [ "-Wno-dev" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 364bf2acce85f..1be062581944d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34050,9 +34050,7 @@ with pkgs; colobot = callPackage ../games/colobot { }; - corsix-th = callPackage ../games/corsix-th { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo CoreMedia VideoToolbox; - }; + corsix-th = callPackage ../games/corsix-th { }; enigma = callPackage ../games/enigma { }; From 3ff8deb4c15c6ab74f814cbc87e0d8121178915f Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 31 Oct 2024 21:39:56 +0000 Subject: [PATCH 4/5] julius: update to apple-sdk pattern --- pkgs/games/julius/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index f5f5bb6d1eb46..6c85b45b0e102 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -6,6 +6,7 @@ , cmake , libpng , darwin +, apple-sdk_11 , libicns , imagemagick }: @@ -38,9 +39,7 @@ stdenv.mkDerivation rec { SDL2 SDL2_mixer libpng - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall From b575b1eed993b5bca4abbf084a6bc04c54b91ca0 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 31 Oct 2024 21:46:10 +0000 Subject: [PATCH 5/5] shipwright: update to apple-sdk pattern --- pkgs/games/shipwright/default.nix | 16 +++------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index 2ff8c063f5f0d..8641055e8b93a 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"; @@ -65,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release copyDesktopItems - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ libicns darwin.sigtool ]; @@ -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 1be062581944d..a01095f63f408 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;