diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-23 22:57:51 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-03-23 23:09:41 +0100 |
| commit | d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063 (patch) | |
| tree | 45309f502d3c071221c6cab4b053636b8471bee7 /pkgs | |
| parent | 5b5357ae1eec83f6e52d4f61298cf5cb86055cae (diff) | |
| download | nixpkgs-d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063.tar nixpkgs-d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063.tar.gz nixpkgs-d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063.tar.bz2 nixpkgs-d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063.tar.lz nixpkgs-d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063.tar.xz nixpkgs-d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063.tar.zst nixpkgs-d6e2366b1cd97d4cdcc5c84a361bc8533dd6c063.zip | |
mpd: fix i686-linux build
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/mpd/x86.patch | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index e3938ec71a8..1883764e24f 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , avahiSupport ? true, avahi, dbus , flacSupport ? true, flac @@ -42,6 +42,8 @@ in stdenv.mkDerivation rec { sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl"; }; + patches = [ ./x86.patch ]; + buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd diff --git a/pkgs/servers/mpd/x86.patch b/pkgs/servers/mpd/x86.patch new file mode 100644 index 00000000000..3e4c036418d --- /dev/null +++ b/pkgs/servers/mpd/x86.patch @@ -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" |