mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

treewide: update own packages to the new apple-sdk pattern (#352719)

Browse source
This commit is contained in:
Aleksana 2024-11-05 19:58:31 +08:00 committed by GitHub
parent dc227b12af 04136354ee
commit 5ad8bdff11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/emulators/86box/default.nix
View file

@ -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"

3
pkgs/games/augustus/default.nix
View file

@ -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

13
pkgs/games/corsix-th/default.nix
View file

@ -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" ];

5
pkgs/games/julius/default.nix
View file

@ -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

14
pkgs/games/shipwright/default.nix
View file

@ -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)

8
pkgs/top-level/all-packages.nix
View file

@ -33925,9 +33925,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 { };
@ -33965,9 +33963,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;