public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpd: 0.20.6 -> 0.20.9

Browse Source 
Upstream has also moved to github.
This commit is contained in:
Peter Hoeg 2017-06-09 12:04:23 +08:00
parent 292f121fb2
commit c87f034977
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/servers/mpd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, systemd, boost, darwin { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin
, alsaSupport ? true, alsaLib , alsaSupport ? true, alsaLib
, avahiSupport ? true, avahi, dbus , avahiSupport ? true, avahi, dbus
, flacSupport ? true, flac , flacSupport ? true, flac
@ -33,18 +33,22 @@ let
opt = stdenv.lib.optional; opt = stdenv.lib.optional;
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
major = "0.20"; major = "0.20";
minor = "6"; minor = "9";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "mpd-${major}${if minor == "" then "" else "." + minor}"; name = "mpd-${version}";
src = fetchurl { version = "${major}${if minor == "" then "" else "." + minor}";
url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl"; src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
sha256 = "17ly30syrlw5274washifr0nddll3g1zb4rr4f9sfnlxz9wz73p1";
}; };
patches = [ ./x86.patch ]; patches = [ ./x86.patch ];
buildInputs = [ pkgconfig glib boost ] buildInputs = [ glib boost ]
++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
++ opt stdenv.isLinux systemd ++ opt stdenv.isLinux systemd
++ opt (stdenv.isLinux && alsaSupport) alsaLib ++ opt (stdenv.isLinux && alsaSupport) alsaLib
@ -77,6 +81,10 @@ in stdenv.mkDerivation rec {
++ opt opusSupport libopus ++ opt opusSupport libopus
++ opt soundcloudSupport yajl; ++ opt soundcloudSupport yajl;
nativeBuildInputs = [ autoreconfHook pkgconfig ];
enableParallelBuilding = true;
configureFlags = configureFlags =
[ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
(mkFlag flacSupport "flac") (mkFlag flacSupport "flac")