Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

several: update own packages to the new apple-sdk pattern #352719

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+13 −36
Open

several: update own packages to the new apple-sdk pattern #352719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a445fb0
_86Box: update to apple-sdk pattern
Oct 31, 2024
799fd41
augustus: update to apple-sdk pattern
Oct 31, 2024
96424cb
corsix-th: update to apple-sdk pattern
Oct 31, 2024
3ff8deb
julius: update to apple-sdk pattern
Oct 31, 2024
b575b1e
shipwright: update to apple-sdk pattern
Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/emulators/86box/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
stdenv,
darwin,
apple-sdk_11,
lib,
fetchFromGitHub,
cmake,
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion pkgs/games/augustus/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
SDL2_mixer,
libpng,
darwin,
apple-sdk_11,
libicns,
imagemagick,
}:
Expand Down Expand Up @@ -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
Expand Down
13 changes: 2 additions & 11 deletions pkgs/games/corsix-th/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
, timidity
# Darwin dependencies
, libiconv
, Cocoa
, CoreVideo
, CoreMedia
, VideoToolbox
, apple-sdk_11
# Update
, nix-update-script
}:
Expand Down Expand Up @@ -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" ];

Expand Down
5 changes: 2 additions & 3 deletions pkgs/games/julius/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
, cmake
, libpng
, darwin
, apple-sdk_11
, libicns
, imagemagick
}:
Expand Down Expand Up @@ -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
Expand Down
16 changes: 3 additions & 13 deletions pkgs/games/shipwright/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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 [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lib.optional will wrap the 2nd arg in a list, which you don't want.

Suggested change
] ++ lib.optional stdenv.hostPlatform.isDarwin [
] ++ lib.optionals stdenv.hostPlatform.isDarwin [

libicns
darwin.sigtool
];
Expand All @@ -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)
Expand Down
8 changes: 2 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down Expand Up @@ -34090,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;
Expand Down