Merge remote-tracking branch 'origin/master' into staging

2019-01-10 16:00:34 +01:00
parent 52a12dacf9 2f1e8d40cf
commit 237deba4e7
281 changed files with 16988 additions and 13353 deletions
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -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 \