box64: 0.2.8 -> 0.3.0 (#326034)

This commit is contained in:
Cosima Neidahl 2024-08-27 16:34:12 +02:00 committed by GitHub
commit 27285241da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View File

@ -21,13 +21,13 @@ assert
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "box64"; pname = "box64";
version = "0.2.8"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ptitSeb"; owner = "ptitSeb";
repo = "box64"; repo = "box64";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-P+m+JS3THh3LWMZYW6BQ7QyNWlBuL+hMcUtUbpMHzis="; hash = "sha256-8PpTN7lUjpmSowbaRsfSRWJQRDZICFhVvn05tQYC4PQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, lib , lib
, rkbin , rkbin
, box64 , qemu
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -19,7 +19,7 @@ stdenv.mkDerivation {
do do
# The proprietary, statically linked binaries to perform boot_merge are # The proprietary, statically linked binaries to perform boot_merge are
# x86_64 only. Though we use box64 to emulate if building on aarch64-linux # 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 done
''; '';