Unverified Commit 878830c5 authored by Theodore Ni's avatar Theodore Ni
Browse files

adlplug: use new Darwin SDK pattern

parent 4e3f8b79

pkgs/applications/audio/adlplug/default.nix

+0 −38
Original line number Diff line number Diff line
@@ -12,22 +12,6 @@ 
, libXinerama

, libXext

, libXcursor

, Foundation

, Cocoa

, Carbon

, CoreServices

, ApplicationServices

, CoreAudio

, CoreMIDI

, AudioToolbox

, Accelerate

, CoreImage

, IOKit

, AudioUnit

, QuartzCore

, WebKit

, DiscRecording

, CoreAudioKit



  # Enabling JACK requires a JACK server at runtime, no fallback mechanism

, withJack ? false, jack
@@ -61,11 +45,6 @@ stdenv.mkDerivation rec { 
    "-DADLplug_Jack=${if withJack then "ON" else "OFF"}"

  ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [

    # "fp.h" file not found

    "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers"

  ]);



  NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [

    # Framework that JUCE needs which don't get linked properly

    "-framework CoreAudioKit"
@@ -96,23 +75,6 @@ stdenv.mkDerivation rec { 
    libXinerama

    libXext

    libXcursor

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    Foundation

    Cocoa

    Carbon

    CoreServices

    ApplicationServices

    CoreAudio

    CoreMIDI

    AudioToolbox

    Accelerate

    CoreImage

    IOKit

    AudioUnit

    QuartzCore

    WebKit

    DiscRecording

    CoreAudioKit

  ] ++ lib.optional withJack jack;



  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -900,7 +900,6 @@ with pkgs; 
  actdiag = with python3.pkgs; toPythonApplication actdiag;















  adlplug = callPackage ../applications/audio/adlplug {













    inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit;















    jack = libjack2;















  };















  opnplug = adlplug.override {