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

cmus: fix on darwin (using gcc)

Browse Source
This commit is contained in:
Daiderd Jordan 2017-01-24 22:39:01 +01:00
parent 1e324cdd57
commit 5afd6a9bea
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, ncurses, pkgconfig, gcc { stdenv, fetchFromGitHub, ncurses, pkgconfig
, gcc, libiconv, CoreAudio
, alsaSupport ? stdenv.isLinux, alsaLib ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null
# simple fallback for everyone else # simple fallback for everyone else
@ -18,7 +19,7 @@
, cddbSupport ? true, libcddb ? null , cddbSupport ? true, libcddb ? null
, cdioSupport ? true, libcdio ? null , cdioSupport ? true, libcdio ? null
, cueSupport ? true, libcue ? null , cueSupport ? true, libcue ? null
, discidSupport ? true, libdiscid ? null , discidSupport ? (!stdenv.isDarwin), libdiscid ? null
, ffmpegSupport ? true, ffmpeg ? null , ffmpegSupport ? true, ffmpeg ? null
, flacSupport ? true, flac ? null , flacSupport ? true, flac ? null
, madSupport ? true, libmad ? null , madSupport ? true, libmad ? null
@ -109,13 +110,16 @@ stdenv.mkDerivation rec {
"CONFIG_WAV=y" "CONFIG_WAV=y"
] ++ concatMap (a: a.flags) opts); ] ++ concatMap (a: a.flags) opts);
buildInputs = [ ncurses pkgconfig gcc ] ++ concatMap (a: a.deps) opts; buildInputs = [ ncurses pkgconfig ]
++ stdenv.lib.optional stdenv.cc.isClang gcc
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
++ concatMap (a: a.deps) opts;
meta = { meta = with stdenv.lib; {
description = "Small, fast and powerful console music player for Linux and *BSD"; description = "Small, fast and powerful console music player for Linux and *BSD";
homepage = https://cmus.github.io/; homepage = https://cmus.github.io/;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.oxij ]; maintainers = [ maintainers.oxij ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

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

@ -12690,6 +12690,7 @@ with pkgs;
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;
libjack = libjack2; libjack = libjack2;
libcdio = libcdio082; libcdio = libcdio082;
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;