diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/bullet | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/bullet')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/bullet/default.nix | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/bullet/default.nix b/nixpkgs/pkgs/development/libraries/bullet/default.nix index 50bf56bfbd22..167dda7c4c4a 100644 --- a/nixpkgs/pkgs/development/libraries/bullet/default.nix +++ b/nixpkgs/pkgs/development/libraries/bullet/default.nix @@ -1,25 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut -, Cocoa, OpenGL +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libGLU +, libGL +, freeglut +, Cocoa +, OpenGL }: stdenv.mkDerivation rec { pname = "bullet"; - version = "2.87"; + version = "3.21"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3"; + sha256 = "sha256-krzqZ2TPycyWjJzYJ69rb6Qgymlio5HGw2nPCjDZPGk="; }; 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 ''; @@ -36,6 +44,7 @@ stdenv.mkDerivation rec { "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework" "-DBUILD_BULLET2_DEMOS=OFF" "-DBUILD_UNIT_TESTS=OFF" + "-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF" ]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang |