diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:31:24 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-13 23:11:20 +0000 |
| commit | fe7537945909ad051ad1ae532a656f49fd9b4301 (patch) | |
| tree | bbce65b67a3acd58e25183b16c1570d7652f4589 /pkgs | |
| parent | d364e682b07447c81bc07a2c5b77cf815abc4738 (diff) | |
| download | nixlib-fe7537945909ad051ad1ae532a656f49fd9b4301.tar nixlib-fe7537945909ad051ad1ae532a656f49fd9b4301.tar.gz nixlib-fe7537945909ad051ad1ae532a656f49fd9b4301.tar.bz2 nixlib-fe7537945909ad051ad1ae532a656f49fd9b4301.tar.lz nixlib-fe7537945909ad051ad1ae532a656f49fd9b4301.tar.xz nixlib-fe7537945909ad051ad1ae532a656f49fd9b4301.tar.zst nixlib-fe7537945909ad051ad1ae532a656f49fd9b4301.zip | |
bomi: move defaults to package file
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/bomi/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 3 deletions
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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a2e5ff86d24..9c38b75a17ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16207,7 +16207,6 @@ in bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { - pulseSupport = config.pulseaudio or true; ffmpeg = ffmpeg_2; }; |