From 4807e0428301d6e9a73feb3b3caccce8d896da93 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Oct 2018 23:29:02 +0100 Subject: [PATCH 1/2] libmikmod: remove duplicate libpulseaudio dep This is already included as a propagatedBuildInput, so no need to have it also be a buildInput. --- pkgs/development/libraries/libmikmod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index c509fcd2b4f..c83d2610dbf 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ optionals stdenv.isLinux [ alsaLib libpulseaudio ] + ++ optional stdenv.isLinux alsaLib ++ optional stdenv.isDarwin CoreAudio; propagatedBuildInputs = optional stdenv.isLinux libpulseaudio; From c49aa0d0dfb223675ca956f01747d97bdfb37005 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Oct 2018 23:31:17 +0100 Subject: [PATCH 2/2] bb: add Darwin compatibility It even has working sound, unlike on Linux! --- pkgs/applications/misc/bb/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 0689843af61..f085e4bd7dd 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }: +{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }: stdenv.mkDerivation rec { name = "bb-${version}"; @@ -12,13 +12,17 @@ stdenv.mkDerivation rec { buildInputs = [ aalib ncurses libmikmod xorg.libXau xorg.libXdmcp xorg.libX11 - ]; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudio; - meta = with stdenv.lib; { + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i -e '/^#include $/d' *.c + ''; + + meta = with lib; { homepage = http://aa-project.sourceforge.net/bb; description = "AA-lib demo"; license = licenses.gpl2; maintainers = [ maintainers.rnhmjoj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }