diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 05:24:01 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 05:24:40 +0300 |
| commit | c225bc8576afe3c1fba75192ca9905eb452b149a (patch) | |
| tree | fdb76357fe8d8f948fa50140c4b21b89cbf77431 /pkgs/development | |
| parent | cd084f2ea49b7c47c3b26077212bd4064c4f2896 (diff) | |
| download | nixlib-c225bc8576afe3c1fba75192ca9905eb452b149a.tar nixlib-c225bc8576afe3c1fba75192ca9905eb452b149a.tar.gz nixlib-c225bc8576afe3c1fba75192ca9905eb452b149a.tar.bz2 nixlib-c225bc8576afe3c1fba75192ca9905eb452b149a.tar.lz nixlib-c225bc8576afe3c1fba75192ca9905eb452b149a.tar.xz nixlib-c225bc8576afe3c1fba75192ca9905eb452b149a.tar.zst nixlib-c225bc8576afe3c1fba75192ca9905eb452b149a.zip | |
bullet: 2.80 -> 2.83
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/bullet/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 6320dd58e4c6..541115b1ff16 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl, cmake, mesa, freeglut }: +{ stdenv, fetchFromGitHub, cmake, mesa, freeglut }: stdenv.mkDerivation rec { - name = "bullet-2.80"; # vdrift 2012-07-22 doesn't build with 2.81 - rev = "2531"; - src = fetchurl { - url = "http://bullet.googlecode.com/files/${name}-rev${rev}.tgz"; - sha256 = "0dig6k88jz5y0cz6dn186vc4l96l4v56zvwpsp5bv9f5wdwjskj6"; + name = "bullet-${version}"; + version = "2.83.7"; + + src = fetchFromGitHub { + owner = "bulletphysics"; + repo = "bullet3"; + rev = version; + sha256 = "1zz3vs6i5975y9mgb1k1vxrjbf1028v0nc11p646dsvv2vplxx5r"; }; buildInputs = [ cmake mesa freeglut ]; - configurePhase = '' - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF \ - -DCMAKE_INSTALL_PREFIX=$out . - ''; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ]; + + enableParallelBuilding = true; meta = { description = "A professional free 3D Game Multiphysics Library"; |