diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-03-15 09:36:34 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-03-15 09:40:35 +0100 |
| commit | ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b (patch) | |
| tree | d7e8ed6b50852aa3b33123b88515ea373d6967b3 /pkgs/servers/mpd | |
| parent | 98e4c5dd4572d7d38a7fef223f726f89306b20a7 (diff) | |
| download | nixpkgs-ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b.tar nixpkgs-ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b.tar.gz nixpkgs-ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b.tar.bz2 nixpkgs-ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b.tar.lz nixpkgs-ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b.tar.xz nixpkgs-ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b.tar.zst nixpkgs-ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b.zip | |
mpd: 0.20.5 -> 0.20.6
Diffstat (limited to 'pkgs/servers/mpd')
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/mpd/i386.patch | 14 |
2 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 87a477ab057..e3938ec71a8 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -33,17 +33,15 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "5"; + minor = "6"; 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 = "11w9v0l9lf504nkxlb91y5r9x403ikl626mjd1lf4fj44yz76maj"; + sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl"; }; - patches = [ ./i386.patch ]; - buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd diff --git a/pkgs/servers/mpd/i386.patch b/pkgs/servers/mpd/i386.patch deleted file mode 100644 index dca8ea88a8b..00000000000 --- a/pkgs/servers/mpd/i386.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx -index 6986453..167fc07 100644 ---- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx -+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx -@@ -20,8 +20,8 @@ - /* necessary because libavutil/common.h uses UINT64_C */ - #define __STDC_CONSTANT_MACROS - --#include "lib/ffmpeg/Time.hxx" - #include "config.h" -+#include "lib/ffmpeg/Time.hxx" - #include "FfmpegDecoderPlugin.hxx" - #include "lib/ffmpeg/Domain.hxx" - #include "lib/ffmpeg/Error.hxx" |