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

Merge pull request #32922 from marsam/feature/libsoundio-darwin

Browse Source 
libsoundio: Fix build on darwin
This commit is contained in:
Orivej Desh 2017-12-21 13:44:18 +00:00 committed by GitHub
commit 95bb687b38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libsoundio/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio }:
{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }:
stdenv.mkDerivation rec {
version = "1.1.0";
@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
};
buildInputs = [ cmake alsaLib libjack2 libpulseaudio ];
nativeBuildInputs = [ cmake ];
buildInputs = [ libjack2 libpulseaudio ]
++ stdenv.lib.optional stdenv.isLinux alsaLib
++ stdenv.lib.optional stdenv.isDarwin AudioUnit;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes";
meta = with stdenv.lib; {
description = "Cross platform audio input and output";

4
pkgs/top-level/all-packages.nix
View File

@ -9287,7 +9287,9 @@ with pkgs;
libserialport = callPackage ../development/libraries/libserialport { };
libsoundio = callPackage ../development/libraries/libsoundio { };
libsoundio = callPackage ../development/libraries/libsoundio {
inherit (darwin.apple_sdk.frameworks) AudioUnit;
};
libgtop = callPackage ../development/libraries/libgtop {};