From 14a95907514a0114fe4c102663a62a320c49108c Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:41:36 +0300 Subject: [PATCH] deadbeef: remove useless nulls --- pkgs/applications/audio/deadbeef/default.nix | 63 +++++++------------- 1 file changed, 21 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index e8b0ded4c00..ac5cb06a219 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -6,56 +6,35 @@ , pkg-config , jansson # deadbeef can use either gtk2 or gtk3 -, gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null +, gtk2Support ? false, gtk2 +, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook # input plugins -, vorbisSupport ? true, libvorbis ? null -, mp123Support ? true, libmad ? null -, flacSupport ? true, flac ? null -, wavSupport ? true, libsndfile ? null -, cdaSupport ? true, libcdio ? null, libcddb ? null -, aacSupport ? true, faad2 ? null -, opusSupport ? true, opusfile ? null -, wavpackSupport ? false, wavpack ? null -, ffmpegSupport ? false, ffmpeg ? null -, apeSupport ? true, yasm ? null +, vorbisSupport ? true, libvorbis +, mp123Support ? true, libmad +, flacSupport ? true, flac +, wavSupport ? true, libsndfile +, cdaSupport ? true, libcdio, libcddb +, aacSupport ? true, faad2 +, opusSupport ? true, opusfile +, wavpackSupport ? false, wavpack +, ffmpegSupport ? false, ffmpeg +, apeSupport ? true, yasm # misc plugins -, zipSupport ? true, libzip ? null -, artworkSupport ? true, imlib2 ? null -, hotkeysSupport ? true, libX11 ? null -, osdSupport ? true, dbus ? null +, zipSupport ? true, libzip +, artworkSupport ? true, imlib2 +, hotkeysSupport ? true, libX11 +, osdSupport ? true, dbus # output plugins -, alsaSupport ? true, alsa-lib ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null +, alsaSupport ? true, alsa-lib +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio # effect plugins -, resamplerSupport ? true, libsamplerate ? null -, overloadSupport ? true, zlib ? null +, resamplerSupport ? true, libsamplerate +, overloadSupport ? true, zlib # transports -, remoteSupport ? true, curl ? null +, remoteSupport ? true, curl }: assert gtk2Support || gtk3Support; -assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null; -assert vorbisSupport -> libvorbis != null; -assert mp123Support -> libmad != null; -assert flacSupport -> flac != null; -assert wavSupport -> libsndfile != null; -assert cdaSupport -> (libcdio != null && libcddb != null); -assert aacSupport -> faad2 != null; -assert opusSupport -> opusfile != null; -assert zipSupport -> libzip != null; -assert ffmpegSupport -> ffmpeg != null; -assert apeSupport -> yasm != null; -assert artworkSupport -> imlib2 != null; -assert hotkeysSupport -> libX11 != null; -assert osdSupport -> dbus != null; -assert alsaSupport -> alsa-lib != null; -assert pulseSupport -> libpulseaudio != null; -assert resamplerSupport -> libsamplerate != null; -assert overloadSupport -> zlib != null; -assert wavpackSupport -> wavpack != null; -assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef";