colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

tangram: build the blueprint compiler via qemu, not binfmt

Browse Source
This commit is contained in:
Colin 2023-08-05 12:03:05 +00:00
parent 378e72ceb7
commit d31aac4d19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overlays/cross.nix
View File

@ -1452,12 +1452,12 @@ in {
tangram = (prev.tangram.override { tangram = (prev.tangram.override {
# N.B. blueprint-compiler is in nativeBuildInputs. # N.B. blueprint-compiler is in nativeBuildInputs.
# the trick here is to force the aarch64 versions to be used during build (via emulation), # the trick here is to force the aarch64 versions to be used during build (via emulation),
blueprint-compiler = (useEmulatedStdenv final.blueprint-compiler).overrideAttrs (upstream: { blueprint-compiler = emulateBuildMachine (final.blueprint-compiler.overrideAttrs (upstream: {
# default is to propagate gobject-introspection *as a buildInput*, when it's supposed to be native. # default is to propagate gobject-introspection *as a buildInput*, when it's supposed to be native.
propagatedBuildInputs = []; propagatedBuildInputs = [];
# "Namespace Gtk not available" # "Namespace Gtk not available"
doCheck = false; doCheck = false;
}); }));
# blueprint-compiler = dontCheck emulated.blueprint-compiler; # blueprint-compiler = dontCheck emulated.blueprint-compiler;
# gjs = dontCheck emulated.gjs; # gjs = dontCheck emulated.gjs;
# gjs = dontCheck (mvToBuildInputs [ final.gobject-introspection ] (useEmulatedStdenv final.gjs)); # gjs = dontCheck (mvToBuildInputs [ final.gobject-introspection ] (useEmulatedStdenv final.gjs));