Unverified Commit 5ad8bdff authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

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

parents dc227b12 04136354

pkgs/applications/emulators/86box/default.nix

+2 −2
Original line number Diff line number Diff line 
{

  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"

pkgs/games/augustus/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

pkgs/games/corsix-th/default.nix

+2 −11
Original line number Diff line number Diff line
@@ -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" ];

pkgs/games/julius/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -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

pkgs/games/shipwright/default.nix

+2 −12
Original line number Diff line number Diff line
@@ -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)