From c3bb776149b1bc2f6bc9cf4fbfb46dd8951f8528 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 5 Aug 2023 12:08:22 +0000 Subject: [PATCH] cross: qt5.qtbase: build in qemu, not binfmt (holy cow, it actually builds this way) --- overlays/cross.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 03e31fda..2d9a1260 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -1210,11 +1210,12 @@ in { # it inherits so much from the `qt5` scope, so not a clear improvement. mkDerivation = self.mkDerivationWith final.stdenv.mkDerivation; callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit (final) stdenv; }; - qtbase = super.qtbase.override { - # qtbase is the only thing in `qt5` scope that references `[stdenv.]mkDerivation`. - # to emulate it, we emulate stdenv; all the other qt5 members are emulated via `qt5.qtModule` - inherit (emulated) stdenv; - }; + qtbase = emulateBuildMachine super.qtbase; + # qtbase = super.qtbase.override { + # # qtbase is the only thing in `qt5` scope that references `[stdenv.]mkDerivation`. + # # to emulate it, we emulate stdenv; all the other qt5 members are emulated via `qt5.qtModule` + # inherit (emulated) stdenv; + # }; }); # qt5 = emulated.qt5.overrideScope (self: super: { # # emulate all the qt5 packages, but rework `libsForQt5.callPackage` and `mkDerivation`