Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-04-18 13:49:22 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
  hardeningDisable = [ "format" ];

  # To avoid problems finding SDL_types.h.
-  configureFlags = [ "CFLAGS=-I${SDL}/include/SDL" ];
+  configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ];

  meta = with stdenv.lib; {
    description = "Quick tactics game";