From d9758316965e7c6f67c440e4059e51d02dbd38cf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 12 Feb 2021 08:31:12 -0300 Subject: [PATCH] gjay: mpd_clientlib -> libmpdclient --- pkgs/applications/audio/gjay/default.nix | 31 ++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 32c61380dca..4bd9c6dcd8f 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,24 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mpd_clientlib, dbus-glib, audacious, gtk2, gsl -, libaudclient }: +{ lib +, stdenv +, fetchurl +, pkg-config +, dbus-glib +, audacious +, gtk2 +, gsl +, libaudclient +, libmpdclient +}: -stdenv.mkDerivation { - name = "gjay-0.3.2"; +stdenv.mkDerivation rec { + pname = "gjay"; + version = "0.3.2"; src = fetchurl { - url = "mirror://sourceforge/project/gjay/gjay-0.3.2.tar.gz"; + url = "mirror://sourceforge/project/gjay/${pname}-${version}.tar.gz"; sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; + buildInputs = [ + libmpdclient + dbus-glib + audacious + gtk2 + gsl + libaudclient + ]; hardeningDisable = [ "format" ]; meta = with lib; { description = "Generates playlists such that each song sounds good following the previous song"; homepage = "http://gjay.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; };