ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

bullet: fix build on aarch64

Browse Source
This commit is contained in:
Linus Heckemann 2018-01-06 00:02:21 +01:00 committed by Alexander Foremny
parent 93cdceafb8
commit 9ab77680b6
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ]
else [mesa freeglut]);
patches = [ ./gwen-narrowing.patch ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt

22
pkgs/development/libraries/bullet/gwen-narrowing.patch Normal file
View File

@ -0,0 +1,22 @@
commit a5d3497577c78b03c05c69d17df972fa9fb54f53
Author: Linus Heckemann <git@sphalerite.org>
Date: Fri Jan 5 23:57:09 2018 +0100
Add -Wno-narrowing to GWEN's CMakeLists
This avoids the compilation issue that occurs on aarch64 with gcc6.
(nixpkgs-specific patch)
diff --git a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
index 82fa0ffba..26c4bbd37 100644
--- a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
+++ b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
@@ -15,7 +15,7 @@ IF(NOT WIN32 AND NOT APPLE)
ADD_DEFINITIONS("-DDYNAMIC_LOAD_X11_FUNCTIONS=1")
ENDIF()
-ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB )
+ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB -Wno-narrowing )
FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/Dialogs/*.cpp" "Controls/Layout/*.cpp" "Controls/Property/*.cpp" "Input/*.cpp" "Platforms/*.cpp" "Renderers/*.cpp" "Skins/*.cpp")
FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h")