alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mpd: 0.20.5 -> 0.20.6

Browse source
This commit is contained in:
Jörg Thalheim 2017-03-15 09:36:34 +01:00
parent 98e4c5dd45
commit ada3bcdcda
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/servers/mpd/default.nix
View file

@ -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

14
pkgs/servers/mpd/i386.patch
View file

@ -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"