mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
rkboot: switch to qemu-x86_64
This commit is contained in:
parent
b9906ed5c6
commit
cae9a627ca
@ -1,7 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, rkbin
|
||||
, box64
|
||||
, qemu
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
do
|
||||
# The proprietary, statically linked binaries to perform boot_merge are
|
||||
# x86_64 only. Though we use box64 to emulate if building on aarch64-linux
|
||||
${lib.optionalString stdenv.isAarch64 "${lib.getExe box64}"} ./tools/boot_merger "$i" || true
|
||||
${lib.optionalString stdenv.isAarch64 "${qemu}/bin/qemu-x86_64"} ./tools/boot_merger "$i" || true
|
||||
done
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user