bullet283: delete old version
This commit is contained in:
parent
3f057db6a0
commit
54c281fa39
@ -1,29 +0,0 @@
|
|||||||
{ stdenv, fetchurl, cmake, mesa, freeglut }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "bullet-2.83.7"; # vdrift 2012-07-22 doesn't build with 2.81
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://github.com/bulletphysics/bullet3/archive/2.83.7.tar.gz";
|
|
||||||
sha256 = "0hqjnmlb2p29yiasrm7kvgv0nklz5zkwhfk4f78zz1gf0vrdil80";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ cmake mesa freeglut ];
|
|
||||||
configurePhase = ''
|
|
||||||
cmake -DBUILD_SHARED_LIBS=ON -DINSTALL_EXTRA_LIBS=TRUE \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=$out .
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "A professional free 3D Game Multiphysics Library";
|
|
||||||
longDescription = ''
|
|
||||||
Bullet 3D Game Multiphysics Library provides state of the art collision
|
|
||||||
detection, soft body and rigid body dynamics.
|
|
||||||
'';
|
|
||||||
homepage = https://github.com/bulletphysics/bullet3;
|
|
||||||
license = stdenv.lib.licenses.zlib;
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ aforemny ];
|
|
||||||
platforms = with stdenv.lib.platforms; linux;
|
|
||||||
};
|
|
||||||
}
|
|
@ -21,14 +21,18 @@ stdenv.mkDerivation rec {
|
|||||||
sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
|
sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ] ++
|
cmakeFlags = [
|
||||||
stdenv.lib.optionals stdenv.isDarwin [
|
"-DBUILD_SHARED_LIBS=ON"
|
||||||
|
"-DBUILD_CPU_DEMOS=OFF"
|
||||||
|
"-DINSTALL_EXTRA_LIBS=ON"
|
||||||
|
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||||
"-DMACOSX_DEPLOYMENT_TARGET=\"10.9\""
|
"-DMACOSX_DEPLOYMENT_TARGET=\"10.9\""
|
||||||
"-DOPENGL_FOUND=true"
|
"-DOPENGL_FOUND=true"
|
||||||
"-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
|
"-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
|
||||||
"-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
|
"-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
|
||||||
"-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
|
"-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
|
||||||
"-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"];
|
"-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -18165,7 +18165,6 @@ with pkgs;
|
|||||||
};
|
};
|
||||||
|
|
||||||
stuntrally = callPackage ../games/stuntrally {
|
stuntrally = callPackage ../games/stuntrally {
|
||||||
bullet = bullet283;
|
|
||||||
mygui = mygui.override {
|
mygui = mygui.override {
|
||||||
withOgre = true;
|
withOgre = true;
|
||||||
};
|
};
|
||||||
@ -19857,7 +19856,6 @@ with pkgs;
|
|||||||
};
|
};
|
||||||
|
|
||||||
bullet = callPackage ../development/libraries/bullet {};
|
bullet = callPackage ../development/libraries/bullet {};
|
||||||
bullet283 = callPackage ../development/libraries/bullet/bullet283.nix {};
|
|
||||||
|
|
||||||
spdlog = callPackage ../development/libraries/spdlog { };
|
spdlog = callPackage ../development/libraries/spdlog { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user