From 8eb03e27582935aa1c6e8b0c09194637dc90bdb8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 10 Feb 2021 11:03:53 -0300 Subject: [PATCH] mpd_clientlib: rename to libmpdclient The name libmpdclient is the original name of the project, and it is the most used by other projects and package managers. Also, there is no reason why not to use the name libmpdclient. --- .../mpd/{clientlib.nix => libmpdclient.nix} | 16 +++++++++++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) rename pkgs/servers/mpd/{clientlib.nix => libmpdclient.nix} (73%) diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/libmpdclient.nix similarity index 73% rename from pkgs/servers/mpd/clientlib.nix rename to pkgs/servers/mpd/libmpdclient.nix index e0df9458f87..4ff45b527b1 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/libmpdclient.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { - version = "2.19"; pname = "libmpdclient"; + version = "2.19"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; - repo = "libmpdclient"; + repo = pname; rev = "v${version}"; sha256 = "01agvjscdxagw6jcfx0wg81c4b6p8rh0hp3slycmjs2b835kvmq2"; }; @@ -17,8 +23,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client library for MPD (music player daemon)"; homepage = "https://www.musicpd.org/libs/libmpdclient/"; - license = licenses.gpl2; + license = licenses.bsd2; + maintainers = with maintainers; [ ehmry AndersonTorres ]; platforms = platforms.unix; - maintainers = with maintainers; [ ehmry ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4656d30db6..ccd532c2e67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17916,7 +17916,8 @@ in inherit (callPackages ../servers/mpd { }) mpd mpd-small mpdWithFeatures; - mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + mpd_clientlib = libmpdclient; + libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; mpdscribble = callPackage ../tools/misc/mpdscribble { };