From 793e6d9a1812c60b71d6ba38502bbd5a1ed747c0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 30 Jul 2024 17:21:46 +0200 Subject: [PATCH] box86: Fix updateScript Need gitUpdater from buildPackages, otherwise it tries to cross-compile some things that are broken on cross (pycparser, Nix) --- pkgs/applications/emulators/box86/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/box86/default.nix b/pkgs/applications/emulators/box86/default.nix index 961188b2df8d..d5db0f3d4966 100644 --- a/pkgs/applications/emulators/box86/default.nix +++ b/pkgs/applications/emulators/box86/default.nix @@ -1,8 +1,8 @@ { + buildPackages, lib, stdenv, fetchFromGitHub, - gitUpdater, cmake, python3, withDynarec ? stdenv.hostPlatform.isAarch32, @@ -71,7 +71,8 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + # gitUpdater for local system, otherwise we're cross-compiling gitUpdater + updateScript = buildPackages.gitUpdater { rev-prefix = "v"; }; tests.hello = runCommand "box86-test-hello" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to