From 9361acfff13586840a41e16496c28dc27848671d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:21 +0000 Subject: [PATCH] aegisub: move defaults to package file --- pkgs/applications/video/aegisub/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 10 ++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index d4208aee62e..a613ad1c584 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebb7ec105ce..b684dcd3c2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -406,15 +406,9 @@ in aefs = callPackage ../tools/filesystems/aefs { }; - aegisub = callPackage ../applications/video/aegisub { + aegisub = callPackage ../applications/video/aegisub ({ wxGTK = wxGTK30; - spellcheckSupport = config.aegisub.spellcheckSupport or true; - automationSupport = config.aegisub.automationSupport or true; - openalSupport = config.aegisub.openalSupport or false; - alsaSupport = config.aegisub.alsaSupport or true; - pulseaudioSupport = config.aegisub.pulseaudioSupport or true; - portaudioSupport = config.aegisub.portaudioSupport or false; - }; + } // (config.aegisub or {})); aerospike = callPackage ../servers/nosql/aerospike { };