public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49079 from alyssais/bb 

bb: add Darwin compatibility
This commit is contained in:
Daiderd Jordan 2018-10-29 11:08:14 +00:00 committed by GitHub
parent cfd3db5c66 c49aa0d0df
commit d80f2dba6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/bb/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }: { stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bb-${version}"; name = "bb-${version}";
@ -12,13 +12,17 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
aalib ncurses libmikmod aalib ncurses libmikmod
xorg.libXau xorg.libXdmcp xorg.libX11 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 <malloc.h>$/d' *.c
'';
meta = with lib; {
homepage = http://aa-project.sourceforge.net/bb; homepage = http://aa-project.sourceforge.net/bb;
description = "AA-lib demo"; description = "AA-lib demo";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.rnhmjoj ]; maintainers = [ maintainers.rnhmjoj ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/development/libraries/libmikmod/default.nix
View File

@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
}; };
buildInputs = [ texinfo ] buildInputs = [ texinfo ]
++ optionals stdenv.isLinux [ alsaLib libpulseaudio ] ++ optional stdenv.isLinux alsaLib
++ optional stdenv.isDarwin CoreAudio; ++ optional stdenv.isDarwin CoreAudio;
propagatedBuildInputs = propagatedBuildInputs =
optional stdenv.isLinux libpulseaudio; optional stdenv.isLinux libpulseaudio;