File tree Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change 19
19
# forGithubSystems = lib.genAttrs githubSystems;
20
20
# TODO: githubSystems should be supportedSystems intersects lib.githubPlatforms
21
21
# Some of the dependencies don't build on clang. Will fix later
22
- # vixl won't build on aarch64. Something to do with the include paths
23
- supportedSystems = [ "x86_64-linux" ] ;
22
+ supportedSystems = [ "x86_64-linux" "aarch64-linux" ] ;
24
23
forAllSystems = lib . genAttrs supportedSystems ;
25
24
forGithubSystems = lib . genAttrs supportedSystems ;
26
25
in {
Original file line number Diff line number Diff line change 12
12
libX11 ,
13
13
pkg-config ,
14
14
imagemagick ,
15
- # luajit,
16
15
luajitPackages ,
17
16
multipart-parser-c ,
18
17
fmt ,
52
51
rev = "7c021819bbd4843a1a3091fe47346d3fcb2a3e1a" ;
53
52
hash = "sha256-gZHbNuDkLXlLlXZZpLBHcbwzTfeBBkLY7xl4L5yr2lY=" ;
54
53
} ;
54
+ vixl = fetchFromGitHub {
55
+ owner = "grumpycoders" ;
56
+ repo = "vixl" ;
57
+ rev = "53ad192b26ddf6edd228a24ae1cffc363b442c01" ;
58
+ hash = "sha256-p9Z2lFzhqnHnFWfqT6BIJBVw2ZpkVIxykhG3jUHXA84=" ;
59
+ } ;
55
60
imgui-md = fetchFromGitHub {
56
61
owner = "mekhontsev" ;
57
62
repo = "imgui_md" ;
@@ -139,7 +144,11 @@ in stdenv.mkDerivation {
139
144
chmod -R +w source/third_party/SDL_GameControllerDB
140
145
chmod -R +w source/third_party/tracy
141
146
chmod -R +w source/third_party/luajit
142
- '' ;
147
+ ''
148
+ + lib . optionalString stdenv . hostPlatform . isAarch ''
149
+ cp -r ${ vixl . out } source/third_party/vixl
150
+ chmod -R +w source/third_party/vixl
151
+ '' ;
143
152
144
153
patches = [
145
154
./001-patch.diff
You can’t perform that action at this time.
0 commit comments