From fcb0ec3f59d526e3e5836f6f7e4b4385cae3fa6d Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Tue, 4 Apr 2023 20:50:54 -0700 Subject: [PATCH] xmp: add Darwin support XMP supports Darwin so long as CoreAudio is available. This PR makes alsa Linux-specific and adds the appropriate Darwin dependencies. --- pkgs/applications/audio/xmp/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 6c0d439a0d1b..14d425f688fb 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp, AudioUnit, CoreAudio }: stdenv.mkDerivation rec { pname = "xmp"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "Extended module player"; homepage = "https://xmp.sourceforge.net/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; src = fetchurl { @@ -17,5 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib libxmp ]; + buildInputs = [ libxmp ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cca980259525..36c740fc0942 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34955,7 +34955,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - xmp = callPackage ../applications/audio/xmp { }; + xmp = callPackage ../applications/audio/xmp { + inherit (darwin.apple_sdk.frameworks) AudioUnit; + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; xnee = callPackage ../tools/X11/xnee { };