Skip to content

Commit 1317919

Browse files
Nix: Add vixl dep
1 parent ace6745 commit 1317919

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

flake.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
# forGithubSystems = lib.genAttrs githubSystems;
2020
# TODO: githubSystems should be supportedSystems intersects lib.githubPlatforms
2121
# 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" ];
2423
forAllSystems = lib.genAttrs supportedSystems;
2524
forGithubSystems = lib.genAttrs supportedSystems;
2625
in {

pcsx-redux.nix

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
libX11,
1313
pkg-config,
1414
imagemagick,
15-
# luajit,
1615
luajitPackages,
1716
multipart-parser-c,
1817
fmt,
@@ -52,6 +51,12 @@ let
5251
rev = "7c021819bbd4843a1a3091fe47346d3fcb2a3e1a";
5352
hash = "sha256-gZHbNuDkLXlLlXZZpLBHcbwzTfeBBkLY7xl4L5yr2lY=";
5453
};
54+
vixl = fetchFromGitHub {
55+
owner = "grumpycoders";
56+
repo = "vixl";
57+
rev = "53ad192b26ddf6edd228a24ae1cffc363b442c01";
58+
hash = "sha256-p9Z2lFzhqnHnFWfqT6BIJBVw2ZpkVIxykhG3jUHXA84=";
59+
};
5560
imgui-md = fetchFromGitHub {
5661
owner = "mekhontsev";
5762
repo = "imgui_md";
@@ -139,7 +144,11 @@ in stdenv.mkDerivation {
139144
chmod -R +w source/third_party/SDL_GameControllerDB
140145
chmod -R +w source/third_party/tracy
141146
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+
'';
143152

144153
patches = [
145154
./001-patch.diff

0 commit comments

Comments
 (0)