diff options
| author | marius david <mariusdavid@laposte.net> | 2021-11-14 10:01:00 +0100 |
|---|---|---|
| committer | marius david <mariusdavid@laposte.net> | 2021-11-14 10:01:00 +0100 |
| commit | b136a8232111d2d12263c7c96d2f08a7b4361693 (patch) | |
| tree | 7bfa760c30c5c312177834db5e0a60784e8d9d68 /pkgs/development/libraries/bullet | |
| parent | 01c257549f4312b85fb362b8a922ea12fed9db41 (diff) | |
| download | nixpkgs-b136a8232111d2d12263c7c96d2f08a7b4361693.tar nixpkgs-b136a8232111d2d12263c7c96d2f08a7b4361693.tar.gz nixpkgs-b136a8232111d2d12263c7c96d2f08a7b4361693.tar.bz2 nixpkgs-b136a8232111d2d12263c7c96d2f08a7b4361693.tar.lz nixpkgs-b136a8232111d2d12263c7c96d2f08a7b4361693.tar.xz nixpkgs-b136a8232111d2d12263c7c96d2f08a7b4361693.tar.zst nixpkgs-b136a8232111d2d12263c7c96d2f08a7b4361693.zip | |
buller: 2.87 -> 3.17
Diffstat (limited to 'pkgs/development/libraries/bullet')
| -rw-r--r-- | pkgs/development/libraries/bullet/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 50bf56bfbd2..c7d26362f00 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -4,22 +4,23 @@ stdenv.mkDerivation rec { pname = "bullet"; - version = "2.87"; + version = "3.17"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3"; + sha256 = "sha256-uQ4X8F8nmagbcFh0KexrmnhHIXFSB3A1CCnjPVeHL3Q="; }; nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; - patches = [ ./gwen-narrowing.patch ]; - - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \ + --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing" + '' + lib.optionalString stdenv.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; |