Merge branch 'master' into staging-next

2019-01-10 13:07:21 +01:00
parent 528664e3bb e0fd84cf43
commit 287144e342
254 changed files with 5494 additions and 3475 deletions
@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
    unzip cmake libGLU_combined freeglut libX11 xorgproto libXi
  ];

-  cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ];
+  cmakeFlags = [
+    "-DBOX2D_INSTALL=ON"
+    "-DBOX2D_BUILD_SHARED=ON"
+    "-DBOX2D_BUILD_EXAMPLES=OFF"
+  ];

  prePatch = ''
    substituteInPlace Box2D/Common/b2Settings.h \