From d31aac4d19f3be765b19f317056aa50e7a7aa766 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 5 Aug 2023 12:03:05 +0000 Subject: [PATCH] tangram: build the blueprint compiler via qemu, not binfmt --- overlays/cross.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 40192dd5..03e31fda 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -1452,12 +1452,12 @@ in { tangram = (prev.tangram.override { # N.B. blueprint-compiler is in nativeBuildInputs. # 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. propagatedBuildInputs = []; # "Namespace Gtk not available" doCheck = false; - }); + })); # blueprint-compiler = dontCheck emulated.blueprint-compiler; # gjs = dontCheck emulated.gjs; # gjs = dontCheck (mvToBuildInputs [ final.gobject-introspection ] (useEmulatedStdenv final.gjs));