diff options
Diffstat (limited to 'pkgs/applications/audio/deadbeef')
7 files changed, 64 insertions, 25 deletions
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 6b92d1263e3..c1cecc13ec5 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,9 +1,9 @@ -{ config, stdenv, fetchFromGitHub +{ config, lib, stdenv, fetchFromGitHub , autoconf , automake , libtool , intltool -, pkgconfig +, pkg-config , jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null @@ -17,7 +17,7 @@ , aacSupport ? true, faad2 ? null , opusSupport ? true, opusfile ? null , wavpackSupport ? false, wavpack ? null -, ffmpegSupport ? false, ffmpeg_3 ? null +, ffmpegSupport ? false, ffmpeg ? null , apeSupport ? true, yasm ? null # misc plugins , zipSupport ? true, libzip ? null @@ -25,7 +25,7 @@ , hotkeysSupport ? true, libX11 ? null , osdSupport ? true, dbus ? null # output plugins -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? true, alsa-lib ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null @@ -45,12 +45,12 @@ assert cdaSupport -> (libcdio != null && libcddb != null); assert aacSupport -> faad2 != null; assert opusSupport -> opusfile != null; assert zipSupport -> libzip != null; -assert ffmpegSupport -> ffmpeg_3 != null; +assert ffmpegSupport -> ffmpeg != null; assert apeSupport -> yasm != null; assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; assert osdSupport -> dbus != null; -assert alsaSupport -> alsaLib != null; +assert alsaSupport -> alsa-lib != null; assert pulseSupport -> libpulseaudio != null; assert resamplerSupport -> libsamplerate != null; assert overloadSupport -> zlib != null; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll"; }; - buildInputs = with stdenv.lib; [ jansson ] + buildInputs = with lib; [ jansson ] ++ optional gtk2Support gtk2 ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] ++ optional vorbisSupport libvorbis @@ -79,12 +79,12 @@ stdenv.mkDerivation rec { ++ optional aacSupport faad2 ++ optional opusSupport opusfile ++ optional zipSupport libzip - ++ optional ffmpegSupport ffmpeg_3 + ++ optional ffmpegSupport ffmpeg ++ optional apeSupport yasm ++ optional artworkSupport imlib2 ++ optional hotkeysSupport libX11 ++ optional osdSupport dbus - ++ optional alsaSupport alsaLib + ++ optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio ++ optional resamplerSupport libsamplerate ++ optional overloadSupport zlib @@ -97,8 +97,8 @@ stdenv.mkDerivation rec { automake intltool libtool - pkgconfig - ] ++ stdenv.lib.optional gtk3Support wrapGAppsHook; + pkg-config + ] ++ lib.optional gtk3Support wrapGAppsHook; enableParallelBuilding = true; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = "http://deadbeef.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index 337d570a935..16cefc5ff85 100644 --- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, libxml2, deadbeef, glib, gtk3 }: stdenv.mkDerivation rec { pname = "deadbeef-headerbar-gtk3-plugin"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config libxml2 ]; buildInputs = [ deadbeef glib gtk3 ]; # Choose correct installation path @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { + meta = with lib; { description = "Plug-in that adds GTK 3 header bar to the DeaDBeeF music player"; homepage = "https://github.com/saivert/ddb_misc_headerbar_GTK3"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index 294d3a0ad8b..3f62e73e7e4 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }: stdenv.mkDerivation rec { pname = "deadbeef-infobar-plugin"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef gtk3 libxml2 ]; buildFlags = [ "gtk3" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash) description = "DeaDBeeF Infobar Plugin"; homepage = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar"; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index 699f9d86f68..bc6d206956f 100644 --- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtkmm3, libxmlxx3 }: stdenv.mkDerivation { pname = "deadbeef-lyricbar-plugin"; @@ -11,12 +11,12 @@ stdenv.mkDerivation { sha256 = "108hx5530f4xm8p9m2bk79nq7jkhcj39ad3vmxb2y6h6l2zv5kwl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef gtkmm3 libxmlxx3 ]; buildFlags = [ "gtk3" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Plugin for DeaDBeeF audio player that fetches and shows the song’s lyrics"; homepage = "https://github.com/C0rn3j/deadbeef-lyricbar"; license = licenses.mit; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 95606a869b7..d0c1b4f9e50 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, deadbeef, glib }: +{ lib, stdenv, fetchurl, pkg-config, deadbeef, glib }: stdenv.mkDerivation rec { pname = "deadbeef-mpris2-plugin"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ deadbeef glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix new file mode 100644 index 00000000000..a1ca052f9c6 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl +, libdbusmenu-glib }: + +stdenv.mkDerivation rec { + pname = "deadbeef-statusnotifier-plugin"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "vovochka404"; + repo = "deadbeef-statusnotifier-plugin"; + rev = "v${version}"; + sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ deadbeef gtk3 libdbusmenu-glib ]; + + buildFlags = [ "gtk3" ]; + + postPatch = '' + substituteInPlace tools/glib-mkenums \ + --replace /usr/bin/perl "${perl}/bin/perl" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/deadbeef + cp build/sni_gtk3.so $out/lib/deadbeef + runHook postInstall + ''; + + meta = with lib; { + description = "DeaDBeeF StatusNotifier Plugin"; + homepage = "https://github.com/vovochka404/deadbeef-statusnotifier-plugin"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.kurnevsky ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix index cd45ef5926b..66108deab1e 100644 --- a/pkgs/applications/audio/deadbeef/wrapper.nix +++ b/pkgs/applications/audio/deadbeef/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ deadbeef ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/deadbeef \ |