b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #168958 from misuzu/cmus-aarch64-darwin

Browse source 
cmus: fix build on aarch64-darwin
This commit is contained in:
Artturi 2022-04-16 23:24:14 +03:00 committed by GitHub
parent 5e8ed18bac ed97ebc9d2
commit b5eaa38c5d
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
, libiconv, CoreAudio, AudioUnit
, libiconv, CoreAudio, AudioUnit, VideoToolbox
, alsaSupport ? stdenv.isLinux, alsa-lib ? null
# simple fallback for everyone else
@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ]
++ lib.optional stdenv.cc.isClang clangGCC
++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ]
++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ]
++ flatten (concatMap (a: a.deps) opts);
makeFlags = [ "LD=$(CC)" ];

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

@ -25141,7 +25141,7 @@ with pkgs;
cmctl = callPackage ../applications/networking/cluster/cmctl { };
cmus = callPackage ../applications/audio/cmus {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio VideoToolbox;
libjack = libjack2;
};