diff options
author | numkem <numkem@numkem.org> | 2018-06-15 15:35:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-15 15:35:23 -0400 |
commit | cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d (patch) | |
tree | ad1269cffa620ce756c0533e438ac86febdf4add /pkgs/servers/mpd/clientlib.nix | |
parent | 47aa1da7a020e96764ef522c2d63398aa0332798 (diff) | |
parent | 54ea1cd58aefde76f7ab2f63e955b9c622c70d1f (diff) | |
download | nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.gz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.bz2 nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.lz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.xz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.zst nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.zip |
Merge pull request #1 from NixOS/master
Sync with upstream
Diffstat (limited to 'pkgs/servers/mpd/clientlib.nix')
-rw-r--r-- | pkgs/servers/mpd/clientlib.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 41e3b547f70e..478d43722679 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchurl, doxygen }: +{ stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { - version = "${passthru.majorVersion}.${passthru.minorVersion}"; + version = "2.14"; name = "libmpdclient-${version}"; - src = fetchurl { - url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.xz"; - sha256 = "10pzs9z815a8hgbbbiliapyiw82bnplsccj5irgqjw5f5plcs22g"; + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "libmpdclient"; + rev = "v${version}"; + sha256 = "15vn9m4qcsccff5rg7jkzy5503skz6bmqqk6qc2smgvjgwn533sm"; }; - buildInputs = [ doxygen ]; - - passthru = { - majorVersion = "2"; - minorVersion = "10"; - }; + nativeBuildInputs = [ meson ninja ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; - homepage = http://www.musicpd.org/libs/libmpdclient/; + homepage = https://www.musicpd.org/libs/libmpdclient/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ mornfall emery ]; + maintainers = with maintainers; [ ehmry ]; }; } |