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

mpd: fix i686-linux build

Browse Source 
See upstream https://github.com/MaxKellermann/MPD/pull/24, not clear if
this will be merged upstream as the author has been quite uncooperative.

Github patch URL (https://github.com/MaxKellermann/MPD/pull/24.patch)
sadly does not work for this.
This commit is contained in:
Robin Gloster 2017-03-23 22:57:51 +01:00
parent 5b5357ae1e
commit d6e2366b1c
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin { stdenv, fetchurl, fetchpatch, 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
@ -42,6 +42,8 @@ in stdenv.mkDerivation rec {
sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl"; sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl";
}; };
patches = [ ./x86.patch ];
buildInputs = [ pkgconfig glib boost ] buildInputs = [ pkgconfig 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

12
pkgs/servers/mpd/x86.patch Normal file
View File

@ -0,0 +1,12 @@
--- 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"