diff options
Diffstat (limited to 'pkgs/applications/audio/cmus/default.nix')
-rw-r--r-- | pkgs/applications/audio/cmus/default.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 3e5916ba098..ea7ad1015be 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,12 +1,12 @@ -{ config, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig -, libiconv, CoreAudio +{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config +, libiconv, CoreAudio, AudioUnit -, alsaSupport ? stdenv.isLinux, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null # simple fallback for everyone else , aoSupport ? !stdenv.isLinux, libao ? null , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null -, ossSupport ? false, alsaOss ? null +, ossSupport ? false, alsa-oss ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null , mprisSupport ? stdenv.isLinux, systemd ? null @@ -39,7 +39,7 @@ #, vtxSupport ? true, libayemu ? null }: -with stdenv.lib; +with lib; assert samplerateSupport -> jackSupport; @@ -55,11 +55,11 @@ let opts = [ # Audio output - (mkFlag alsaSupport "CONFIG_ALSA=y" alsaLib) + (mkFlag alsaSupport "CONFIG_ALSA=y" alsa-lib) (mkFlag aoSupport "CONFIG_AO=y" libao) (mkFlag jackSupport "CONFIG_JACK=y" libjack) (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) - (mkFlag ossSupport "CONFIG_OSS=y" alsaOss) + (mkFlag ossSupport "CONFIG_OSS=y" alsa-oss) (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio) (mkFlag mprisSupport "CONFIG_MPRIS=y" systemd) @@ -102,13 +102,13 @@ in stdenv.mkDerivation rec { pname = "cmus"; - version = "2.8.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; rev = "v${version}"; - sha256 = "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar"; + sha256 = "sha256-HEiEnEWf/MzhPO19VKTLYzhylpEvyzy1Jxs6EW2NU34="; }; patches = [ ./option-debugging.patch ]; @@ -118,15 +118,15 @@ stdenv.mkDerivation rec { "CONFIG_WAV=y" ] ++ concatMap (a: a.flags) opts); - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional stdenv.cc.isClang clangGCC - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] + ++ lib.optional stdenv.cc.isClang clangGCC + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = "https://cmus.github.io/"; license = licenses.gpl2; |