diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-16 09:30:46 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-16 09:30:46 +0100 |
| commit | fd48a94b62592c68e7d66329ba33930d3cfe3f37 (patch) | |
| tree | 4230272708eb350a36c29c08cac98e159d5e65a9 /pkgs/applications/audio | |
| parent | a0eb6c1f81e1d294726c644ff47f1e851afb2f10 (diff) | |
| parent | 6fe10d27799c284c72876f792c7b12d7fa54602b (diff) | |
| download | nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.gz nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.bz2 nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.lz nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.xz nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.zst nixlib-fd48a94b62592c68e7d66329ba33930d3cfe3f37.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/cmus/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/deadbeef/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/mimic/default.nix | 13 |
3 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index e36d01b8d2e7..9f69e305f249 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig +{ config, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig , libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -7,7 +7,7 @@ , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null , ossSupport ? false, alsaOss ? null -, pulseaudioSupport ? false, libpulseaudio ? null +, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null # TODO: add these #, artsSupport diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index e2fcc3c4626a..0212560cd03b 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, jansson +{ config, stdenv, fetchurl, intltool, pkgconfig, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null @@ -20,7 +20,7 @@ , osdSupport ? true, dbus ? null # output plugins , alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null , overloadSupport ? true, zlib ? null diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index a4cd0c944dc2..dcaffe3eb9b4 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,6 +1,6 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +{ config, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig , alsaLib, libtool, icu -, pulseaudioSupport ? true, libpulseaudio }: +, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { name = "mimic-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,15 +21,14 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libtool - icu + icu ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; meta = { description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; - homepage = https://mimic.mycroft.ai/; + homepage = https://mimic.mycroft.ai/; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.noneucat ]; + maintainers = [ stdenv.lib.maintainers.noneucat ]; }; } - |