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

Merge pull request #112461 from protoboolean/cmus_fix-macos-build

Browse Source 
cmus: add AudioUnit dependency
This commit is contained in:
Sandro 2021-02-09 09:51:22 +01:00 committed by GitHub
commit 1ae0f04962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/cmus/default.nix
View File

@ -1,5 +1,5 @@
{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config
, libiconv, CoreAudio , libiconv, CoreAudio, AudioUnit
, alsaSupport ? stdenv.isLinux, alsaLib ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null
# simple fallback for everyone else # simple fallback for everyone else
@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ] buildInputs = [ ncurses ]
++ lib.optional stdenv.cc.isClang clangGCC ++ lib.optional stdenv.cc.isClang clangGCC
++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ]
++ flatten (concatMap (a: a.deps) opts); ++ flatten (concatMap (a: a.deps) opts);
makeFlags = [ "LD=$(CC)" ]; makeFlags = [ "LD=$(CC)" ];

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

@ -21434,7 +21434,7 @@ in
cmatrix = callPackage ../applications/misc/cmatrix { }; cmatrix = callPackage ../applications/misc/cmatrix { };
cmus = callPackage ../applications/audio/cmus { cmus = callPackage ../applications/audio/cmus {
inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
libjack = libjack2; libjack = libjack2;
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };