From b0f641840bfb2ab04c8d15e1a68742b516594776 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Wed, 18 May 2022 12:33:41 +0300 Subject: [PATCH] deadbeef: 1.8.4 -> 1.9.1 * Default Pulseaudio support to just true, the package is linux-only anyway * De-rec, while at it. --- pkgs/applications/audio/deadbeef/default.nix | 91 +++++++++++++------- 1 file changed, 62 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ac5cb06a2198..b4e348a39779 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,10 +1,11 @@ -{ config, lib, stdenv, fetchFromGitHub +{ lib, config, clangStdenv, fetchFromGitHub , autoconf , automake , libtool , intltool , pkg-config , jansson +, swift-corelibs-libdispatch # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 , gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook @@ -26,7 +27,7 @@ , osdSupport ? true, dbus # output plugins , alsaSupport ? true, alsa-lib -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pulseSupport ? config.pulseaudio or true, libpulseaudio # effect plugins , resamplerSupport ? true, libsamplerate , overloadSupport ? true, zlib @@ -36,40 +37,70 @@ assert gtk2Support || gtk3Support; -stdenv.mkDerivation rec { +let + inherit (lib) optionals; + + version = "1.9.1"; +in clangStdenv.mkDerivation { pname = "deadbeef"; - version = "1.8.4"; + inherit version; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; + fetchSubmodules = true; rev = version; - sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll"; + sha256 = "sha256-e3bAGpkRPIqVWl0nvSZ61JpIQZw24mqE9218SWHBCFo="; }; - buildInputs = with lib; [ jansson ] - ++ optional gtk2Support gtk2 - ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] - ++ optional vorbisSupport libvorbis - ++ optional mp123Support libmad - ++ optional flacSupport flac - ++ optional wavSupport libsndfile - ++ optionals cdaSupport [ libcdio libcddb ] - ++ optional aacSupport faad2 - ++ optional opusSupport opusfile - ++ optional zipSupport libzip - ++ optional ffmpegSupport ffmpeg - ++ optional apeSupport yasm - ++ optional artworkSupport imlib2 - ++ optional hotkeysSupport libX11 - ++ optional osdSupport dbus - ++ optional alsaSupport alsa-lib - ++ optional pulseSupport libpulseaudio - ++ optional resamplerSupport libsamplerate - ++ optional overloadSupport zlib - ++ optional wavpackSupport wavpack - ++ optional remoteSupport curl - ; + buildInputs = [ + jansson + swift-corelibs-libdispatch + ] ++ optionals gtk2Support [ + gtk2 + ] ++ optionals gtk3Support [ + gtk3 + gsettings-desktop-schemas + ] ++ optionals vorbisSupport [ + libvorbis + ] ++ optionals mp123Support [ + libmad + ] ++ optionals flacSupport [ + flac + ] ++ optionals wavSupport [ + libsndfile + ] ++ optionals cdaSupport [ + libcdio + libcddb + ] ++ optionals aacSupport [ + faad2 + ] ++ optionals opusSupport [ + opusfile + ] ++ optionals zipSupport [ + libzip + ] ++ optionals ffmpegSupport [ + ffmpeg + ] ++ optionals apeSupport [ + yasm + ] ++ optionals artworkSupport [ + imlib2 + ] ++ optionals hotkeysSupport [ + libX11 + ] ++ optionals osdSupport [ + dbus + ] ++ optionals alsaSupport [ + alsa-lib + ] ++ optionals pulseSupport [ + libpulseaudio + ] ++ optionals resamplerSupport [ + libsamplerate + ] ++ optionals overloadSupport [ + zlib + ] ++ optionals wavpackSupport [ + wavpack + ] ++ optionals remoteSupport [ + curl + ]; nativeBuildInputs = [ autoconf @@ -77,7 +108,9 @@ stdenv.mkDerivation rec { intltool libtool pkg-config - ] ++ lib.optional gtk3Support wrapGAppsHook; + ] ++ optionals gtk3Support [ + wrapGAppsHook + ]; enableParallelBuilding = true;