Merge branch 'staging', containing closure-size #7701

2016-04-13 09:25:28 +02:00
parent 81cedab4f1 87b49397bf
commit 39ebb01d6e
882 changed files with 8958 additions and 2482 deletions
@@ -207,7 +207,7 @@ in

    extraBuildInputs = [ libpng SDL ];
  }).override {
-    patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL}/bin/sdl-config\",' configure";
+    patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL.dev}/bin/sdl-config\",' configure";
    configurePhase = "./configure";
  };