pyrox.dev
fex: unvendor catch2, remove unneeded flags
+4
-8
pkgs/by-name/fe/fex/package.nix
+4
-8
pkgs/by-name/fe/fex/package.nix
···
101
101
owner = "FEX-Emu";
102
102
repo = "FEX";
103
103
tag = "FEX-${finalAttrs.version}";
104
-
105
104
hash = "sha256-Dq87cx7tv+HJvpy57L8dcApE+3E8VEyyTYKhDyoUfVU=";
106
105
107
106
leaveDotGit = true;
···
117
116
External/jemalloc_glibc \
118
117
External/robin-map \
119
118
External/vixl \
120
-
Source/Common/cpp-optparse \
121
-
External/Catch2
119
+
Source/Common/cpp-optparse
122
120
123
121
find . -name .git -print0 | xargs -0 rm -rf
124
122
···
165
163
ninja
166
164
pkg-config
167
165
llvmPackages.bintools
168
-
169
166
(python3.withPackages (
170
167
pythonPackages: with pythonPackages; [
171
168
setuptools
···
175
172
]
176
173
++ lib.optional withQt qt6.wrapQtAppsHook;
177
174
178
-
nativeCheckInputs = [ nasm ];
179
-
180
175
buildInputs = [
181
176
xxHash
182
177
fmt
···
196
191
197
192
cmakeFlags = [
198
193
(lib.cmakeFeature "USE_LINKER" "lld")
199
-
(lib.cmakeBool "ENABLE_LTO" true)
200
-
(lib.cmakeBool "ENABLE_ASSERTIONS" false)
201
194
(lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version)
202
195
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
203
196
(lib.cmakeBool "BUILD_THUNKS" true)
···
211
204
212
205
# Unsupported on non-4K page size kernels (e.g. Apple Silicon)
213
206
doCheck = true;
207
+
208
+
nativeCheckInputs = [ nasm ];
209
+
checkInputs = [ catch2 ];
214
210
215
211
# List not exhaustive, e.g. because they depend on an x86 compiler or some
216
212
# other difficult-to-build test binaries.