Unverified Commit a1a95d08 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #276068 from atorres1985-contrib/libmpdclient

Libmpdclient updates
parents e5d1c87f 7f542aa8
Loading
Loading
Loading
Loading
+35 −0
Original line number Diff line number Diff line
{ fetchFromGitHub
, fixDarwinDylibNames
, lib
, meson
, ninja
, stdenv
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "libmpdclient";
  version = "2.22";

  src = fetchFromGitHub {
    owner = "MusicPlayerDaemon";
    repo = "libmpdclient";
    rev = "v${finalAttrs.version}";
    hash = "sha256-KF8IR9YV6b9ro+L9m6nHs1IggakEZddfcBKm/oKCVZY=";
  };

  nativeBuildInputs = [
    meson
    ninja
  ] ++ lib.optionals stdenv.isDarwin [
    fixDarwinDylibNames
  ];

  meta = {
    description = "Client library for MPD (music player daemon)";
    homepage = "https://www.musicpd.org/libs/libmpdclient/";
    changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS";
    license = with lib.licenses; [ bsd2 ];
    maintainers = with lib.maintainers; [ AndersonTorres ehmry ];
    platforms = lib.platforms.unix;
  };
})

pkgs/servers/mpd/libmpdclient.nix

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, fixDarwinDylibNames
}:

stdenv.mkDerivation rec {
  pname = "libmpdclient";
  version = "2.20";

  src = fetchFromGitHub {
    owner  = "MusicPlayerDaemon";
    repo   = pname;
    rev    = "v${version}";
    sha256 = "sha256-qEgdwG7ygVblIa3uRf1tddxHg7T1yvY17nbhZ7NRNvg=";
  };

  nativeBuildInputs = [ meson ninja ]
  ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

  meta = with lib; {
    description = "Client library for MPD (music player daemon)";
    homepage = "https://www.musicpd.org/libs/libmpdclient/";
    license = licenses.bsd2;
    maintainers = with maintainers; [ ehmry AndersonTorres ];
    platforms = platforms.unix;
  };
}
+0 −2
Original line number Diff line number Diff line
@@ -26649,8 +26649,6 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
  }) mpd mpd-small mpdWithFeatures;
  libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { };
  mpdscribble = callPackage ../tools/misc/mpdscribble { };
  mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };