diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-02-15 17:49:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-15 17:49:01 -0500 |
| commit | f8eef26991c3a6660e4343ab42253056826932a8 (patch) | |
| tree | 0d066edaafd70e729bd898d17c75196cd6ce124b /pkgs/applications/video | |
| parent | 2e359d93ef5cffbafa7626c20161cb355844d514 (diff) | |
| parent | e29565110886f9857e48376191f9fbd8e43e2a6d (diff) | |
| download | nixlib-f8eef26991c3a6660e4343ab42253056826932a8.tar nixlib-f8eef26991c3a6660e4343ab42253056826932a8.tar.gz nixlib-f8eef26991c3a6660e4343ab42253056826932a8.tar.bz2 nixlib-f8eef26991c3a6660e4343ab42253056826932a8.tar.lz nixlib-f8eef26991c3a6660e4343ab42253056826932a8.tar.xz nixlib-f8eef26991c3a6660e4343ab42253056826932a8.tar.zst nixlib-f8eef26991c3a6660e4343ab42253056826932a8.zip | |
Merge pull request #55732 from oxij/tree/move-defaults-to-package-files-mostly-pulse
all-packages.nix: move defaults to package files continues
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/aegisub/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/video/bomi/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index d4208aee62e0..a613ad1c5842 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ config, stdenv, fetchurl , libX11, wxGTK , libiconv, fontconfig, freetype , libGLU_combined @@ -8,8 +8,8 @@ , spellcheckSupport ? true, hunspell ? null , automationSupport ? true, lua ? null , openalSupport ? false, openal ? null -, alsaSupport ? true, alsaLib ? null -, pulseaudioSupport ? true, libpulseaudio ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , portaudioSupport ? false, portaudio ? null }: assert spellcheckSupport -> (hunspell != null); diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 671d67946354..bbac10140344 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which +{ config, stdenv, fetchFromGitHub +, fetchpatch, pkgconfig, perl, python, which , libX11, libxcb, libGLU_combined , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet @@ -15,7 +16,7 @@ , libbluray , jackSupport ? false, jack ? null , portaudioSupport ? false, portaudio ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , cddaSupport ? false, libcdda ? null , youtubeSupport ? true, youtube-dl ? null }: diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index e017e7cc0015..c77486a30cf1 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg +{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -19,7 +19,7 @@ , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null , jackaudioSupport ? false, libjack2 ? null -, pulseSupport ? false, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null |