Merge branch 'staging'

This includes a security update of expat.
2016-06-29 07:47:04 +02:00
parent d9036a02b5 f4792cdc0c
commit 3afa246038
64 changed files with 529 additions and 1075 deletions
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
  };

  patches = [ ./0001-change-flags.diff ];
+  postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";

  buildInputs =
  [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ];