diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-06-09 12:04:23 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2017-06-09 12:04:58 +0800 |
| commit | c87f03497730b04c870d39c08e4ae4462709a443 (patch) | |
| tree | 3a04e0da8b2cb960e8ab7f65f87dbd4c1ccc2592 /pkgs/servers | |
| parent | 292f121fb239e9fe89b79988a23b0adf0f0d2ccc (diff) | |
| download | nixlib-c87f03497730b04c870d39c08e4ae4462709a443.tar nixlib-c87f03497730b04c870d39c08e4ae4462709a443.tar.gz nixlib-c87f03497730b04c870d39c08e4ae4462709a443.tar.bz2 nixlib-c87f03497730b04c870d39c08e4ae4462709a443.tar.lz nixlib-c87f03497730b04c870d39c08e4ae4462709a443.tar.xz nixlib-c87f03497730b04c870d39c08e4ae4462709a443.tar.zst nixlib-c87f03497730b04c870d39c08e4ae4462709a443.zip | |
mpd: 0.20.6 -> 0.20.9
Upstream has also moved to github.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 1883764e24ff..b7eb0b5397db 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , avahiSupport ? true, avahi, dbus , flacSupport ? true, flac @@ -33,18 +33,22 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "6"; + minor = "9"; in stdenv.mkDerivation rec { - name = "mpd-${major}${if minor == "" then "" else "." + minor}"; - src = fetchurl { - url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl"; + name = "mpd-${version}"; + version = "${major}${if minor == "" then "" else "." + minor}"; + + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "MPD"; + rev = "v${version}"; + sha256 = "17ly30syrlw5274washifr0nddll3g1zb4rr4f9sfnlxz9wz73p1"; }; patches = [ ./x86.patch ]; - buildInputs = [ pkgconfig glib boost ] + buildInputs = [ glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib @@ -77,6 +81,10 @@ in stdenv.mkDerivation rec { ++ opt opusSupport libopus ++ opt soundcloudSupport yajl; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + enableParallelBuilding = true; + configureFlags = [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") (mkFlag flacSupport "flac") |