nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145385 from marius851000/bullet317

Browse Source 
bullet: 2.87 -> 3.17
This commit is contained in:
Thiago Kenji Okada 2021-11-14 13:51:57 -03:00 committed by GitHub
commit 991b66a5bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/bullet/default.nix
View File

@ -4,22 +4,23 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bullet"; pname = "bullet";
version = "2.87"; version = "3.17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bulletphysics"; owner = "bulletphysics";
repo = "bullet3"; repo = "bullet3";
rev = version; rev = version;
sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3"; sha256 = "sha256-uQ4X8F8nmagbcFh0KexrmnhHIXFSB3A1CCnjPVeHL3Q=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
patches = [ ./gwen-narrowing.patch ]; postPatch = ''
substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \
postPatch = lib.optionalString stdenv.isDarwin '' --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing"
'' + lib.optionalString stdenv.isDarwin ''
sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
''; '';