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

Merge pull request #2802 from Fuuzetsu/mpd

Browse Source 
mpd: PA support and version bump
This commit is contained in:
Austin Seipp 2014-06-03 20:33:11 -05:00
commit 0a4f018718
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,9 @@
, samplerateSupport ? true, libsamplerate , samplerateSupport ? true, libsamplerate
, mmsSupport ? true, libmms , mmsSupport ? true, libmms
, mpg123Support ? true, mpg123 , mpg123Support ? true, mpg123
, aacSupport ? true, faad2 }: , aacSupport ? true, faad2
, pulseaudioSupport ? true, pulseaudio
}:
let let
@ -27,10 +29,10 @@ let
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "mpd-0.18.9"; name = "mpd-0.18.11";
src = fetchurl { src = fetchurl {
url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
sha256 = "0mgfyrhjlalwngx9j3xxfpfwygh9a31k1ni1isi898bb2x8zsl08"; sha256 = "1j3jdwmxfnn4z1vjry2g54vcbrdrgi41nv3bf2i26xkgy5708icw";
}; };
buildInputs = [ pkgconfig glib ] buildInputs = [ pkgconfig glib ]
@ -56,7 +58,8 @@ in stdenv.mkDerivation rec {
++ opt mmsSupport libmms ++ opt mmsSupport libmms
++ opt mpg123Support mpg123 ++ opt mpg123Support mpg123
++ opt aacSupport faad2 ++ opt aacSupport faad2
++ opt zipSupport zziplib; ++ opt zipSupport zziplib
++ opt zipSupport pulseaudio;
configureFlags = configureFlags =
[ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
@ -80,6 +83,7 @@ in stdenv.mkDerivation rec {
(mkFlag mmsSupport "mms") (mkFlag mmsSupport "mms")
(mkFlag mpg123Support "mpg123") (mkFlag mpg123Support "mpg123")
(mkFlag aacSupport "aac") (mkFlag aacSupport "aac")
(mkFlag pulseaudioSupport "pulse")
(mkFlag stdenv.isDarwin "osx") (mkFlag stdenv.isDarwin "osx")
"--enable-debugging" ] "--enable-debugging" ]
++ opt stdenv.isLinux ++ opt stdenv.isLinux