pyrox.dev
lol
bullet: fix build on aarch64
authored by
Linus Heckemann
and committed by
Alexander Foremny
9ab77680
93cdceaf
+24
+2
pkgs/development/libraries/bullet/default.nix
+2
pkgs/development/libraries/bullet/default.nix
···
16
16
then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ]
17
17
else [mesa freeglut]);
18
18
19
+
patches = [ ./gwen-narrowing.patch ];
20
+
19
21
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
20
22
sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
21
23
sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
+22
pkgs/development/libraries/bullet/gwen-narrowing.patch
+22
pkgs/development/libraries/bullet/gwen-narrowing.patch
···
1
+
commit a5d3497577c78b03c05c69d17df972fa9fb54f53
2
+
Author: Linus Heckemann <git@sphalerite.org>
3
+
Date: Fri Jan 5 23:57:09 2018 +0100
4
+
5
+
Add -Wno-narrowing to GWEN's CMakeLists
6
+
7
+
This avoids the compilation issue that occurs on aarch64 with gcc6.
8
+
(nixpkgs-specific patch)
9
+
10
+
diff --git a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
11
+
index 82fa0ffba..26c4bbd37 100644
12
+
--- a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
13
+
+++ b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
14
+
@@ -15,7 +15,7 @@ IF(NOT WIN32 AND NOT APPLE)
15
+
ADD_DEFINITIONS("-DDYNAMIC_LOAD_X11_FUNCTIONS=1")
16
+
ENDIF()
17
+
18
+
-ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB )
19
+
+ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB -Wno-narrowing )
20
+
21
+
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")
22
+
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")