Merge branch 'master' into staging

2016-08-23 18:50:06 +01:00
parent 13c04c837d 415e1983ca
commit 0e8d2725dc
244 changed files with 767 additions and 597 deletions
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
  buildInputs = [ libdv libjpeg libpng pkgconfig ]
              ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ];

+  NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL}/include/SDL";
+
  postPatch = ''
    sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
  '';