From fe7537945909ad051ad1ae532a656f49fd9b4301 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:24 +0000 Subject: [PATCH] bomi: move defaults to package file --- pkgs/applications/video/bomi/default.nix | 5 +++-- 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 671d6794635..bbac1014034 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 6a2e5ff86d2..9c38b75a17a 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; };