summary refs log tree commit diff
path: root/pkgs/servers/mpd
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-05-12 22:35:13 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-05-13 17:45:39 +0200
commit6d1fe178c3160a108fb7b51438822974b9bde1b4 (patch)
tree88ae23c3908fb71f9ba51eb7c87bd3cbd34d26ab /pkgs/servers/mpd
parent939c80c26f073961c104a38f02e5ea5d97b81046 (diff)
downloadnixpkgs-6d1fe178c3160a108fb7b51438822974b9bde1b4.tar
nixpkgs-6d1fe178c3160a108fb7b51438822974b9bde1b4.tar.gz
nixpkgs-6d1fe178c3160a108fb7b51438822974b9bde1b4.tar.bz2
nixpkgs-6d1fe178c3160a108fb7b51438822974b9bde1b4.tar.lz
nixpkgs-6d1fe178c3160a108fb7b51438822974b9bde1b4.tar.xz
nixpkgs-6d1fe178c3160a108fb7b51438822974b9bde1b4.tar.zst
nixpkgs-6d1fe178c3160a108fb7b51438822974b9bde1b4.zip
mpd: 0.19.12 -> 0.19.15
Diffstat (limited to 'pkgs/servers/mpd')
-rw-r--r--pkgs/servers/mpd/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index cce893d17ee..fb9efc45616 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -23,19 +23,20 @@
 , icuSupport ? true, icu
 , clientSupport ? true, mpd_clientlib
 , opusSupport ? true, libopus
+, soundcloudSupport ? true, yajl
 }:
 
 let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.19";
-  minor = "12";
+  minor = "15";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${major}.${minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "0xg8w5vn6xd0yfw55qj6wnav7v14nmr00s3d4w5gixbjrv3ycvvv";
+    sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c";
   };
 
   buildInputs = [ pkgconfig glib boost ]
@@ -65,7 +66,8 @@ in stdenv.mkDerivation rec {
     ++ opt gmeSupport game-music-emu
     ++ opt icuSupport icu
     ++ opt clientSupport mpd_clientlib
-    ++ opt opusSupport libopus;
+    ++ opt opusSupport libopus
+    ++ opt soundcloudSupport yajl;
 
   configureFlags =
     [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
@@ -94,6 +96,7 @@ in stdenv.mkDerivation rec {
       (mkFlag gmeSupport "gme")
       (mkFlag clientSupport "libmpdclient")
       (mkFlag opusSupport "opus")
+      (mkFlag soundcloudSupport "soundcloud")
       "--enable-debug"
     ]
     ++ opt stdenv.isLinux