diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-20 10:42:00 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-20 10:55:47 +0000 |
| commit | 54c281fa39615cd83d03b20b26bf851ab6f25966 (patch) | |
| tree | 4aeb7273ea5084139f0bd94c1f23779278044b7e /pkgs/development/libraries | |
| parent | 3f057db6a0c497e9d6cda4c528b820d7bbfd5bc0 (diff) | |
| download | nixlib-54c281fa39615cd83d03b20b26bf851ab6f25966.tar nixlib-54c281fa39615cd83d03b20b26bf851ab6f25966.tar.gz nixlib-54c281fa39615cd83d03b20b26bf851ab6f25966.tar.bz2 nixlib-54c281fa39615cd83d03b20b26bf851ab6f25966.tar.lz nixlib-54c281fa39615cd83d03b20b26bf851ab6f25966.tar.xz nixlib-54c281fa39615cd83d03b20b26bf851ab6f25966.tar.zst nixlib-54c281fa39615cd83d03b20b26bf851ab6f25966.zip | |
bullet283: delete old version
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/bullet/bullet283.nix | 29 | ||||
| -rw-r--r-- | pkgs/development/libraries/bullet/default.nix | 20 |
2 files changed, 12 insertions, 37 deletions
diff --git a/pkgs/development/libraries/bullet/bullet283.nix b/pkgs/development/libraries/bullet/bullet283.nix deleted file mode 100644 index 36790dbe3a2b..000000000000 --- a/pkgs/development/libraries/bullet/bullet283.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index e7b500905370..f6676321860f 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -21,14 +21,18 @@ stdenv.mkDerivation rec { sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ] ++ - stdenv.lib.optionals stdenv.isDarwin [ - "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\"" - "-DOPENGL_FOUND=true" - "-DOPENGL_LIBRARIES=${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" - "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_CPU_DEMOS=OFF" + "-DINSTALL_EXTRA_LIBS=ON" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\"" + "-DOPENGL_FOUND=true" + "-DOPENGL_LIBRARIES=${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" + "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework" + ]; enableParallelBuilding = true; |