cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #251662 from OPNA2608/update/box64-0.2.4-adjustments

Browse source
This commit is contained in:
Franz Pletz 2023-11-01 17:40:15 +01:00 committed by GitHub
commit 768e973f39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
pkgs/applications/emulators/box64/default.nix
View file

@ -1,29 +1,39 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, gitUpdater , gitUpdater
, cmake , cmake
, python3 , python3
, withDynarec ? stdenv.hostPlatform.isAarch64 , withDynarec ? (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64)
, runCommand , runCommand
, hello-x86_64 , hello-x86_64
, box64
}: }:
# Currently only supported on ARM # Currently only supported on ARM & RISC-V
assert withDynarec -> stdenv.hostPlatform.isAarch64; assert withDynarec -> (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64);
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "box64"; pname = "box64";
version = "0.2.4"; version = "0.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ptitSeb"; owner = "ptitSeb";
repo = pname; repo = "box64";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w="; hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w=";
}; };
patches = [
# Fix crash due to regression in SDL1 AudioCallback signature in 0.2.4
# Remove when version > 0.2.4
(fetchpatch {
name = "0001-box64-Fixed_signature_of_SDL1_AudioCallback.patch";
url = "https://github.com/ptitSeb/box64/commit/5fabd602aea1937e3c5ce58843504c2492b8c0ec.patch";
hash = "sha256-dBdKijTljCFtSJ2smHrbjH/ok0puGw4YEy/kluLl4AQ=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
python3 python3
@ -31,12 +41,20 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DNOGIT=ON" "-DNOGIT=ON"
"-DARM_DYNAREC=${if withDynarec then "ON" else "OFF"}"
"-DRV64=${if stdenv.hostPlatform.isRiscV64 then "ON" else "OFF"}" # Arch mega-option
"-DPPC64LE=${if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then "ON" else "OFF"}" "-DARM64=${lib.boolToString stdenv.hostPlatform.isAarch64}"
"-DRV64=${lib.boolToString stdenv.hostPlatform.isRiscV64}"
"-DPPC64LE=${lib.boolToString (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)}"
"-DLARCH64=${lib.boolToString stdenv.hostPlatform.isLoongArch64}"
] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [
# x86_64 has no arch-specific mega-option, manually enable the options that apply to it
"-DLD80BITS=ON" "-DLD80BITS=ON"
"-DNOALIGN=ON" "-DNOALIGN=ON"
] ++ [
# Arch dynarec
"-DARM_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isAarch64)}"
"-DRV64_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isRiscV64)}"
]; ];
installPhase = '' installPhase = ''
@ -47,9 +65,9 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
doCheck = true; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
doInstallCheck = true; doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
installCheckPhase = '' installCheckPhase = ''
runHook preInstallCheck runHook preInstallCheck
@ -68,7 +86,7 @@ stdenv.mkDerivation rec {
rev-prefix = "v"; rev-prefix = "v";
}; };
tests.hello = runCommand "box64-test-hello" { tests.hello = runCommand "box64-test-hello" {
nativeBuildInputs = [ box64 hello-x86_64 ]; nativeBuildInputs = [ finalAttrs.finalPackage ];
} '' } ''
# There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to
# tell what problems the emulator has run into. # tell what problems the emulator has run into.
@ -81,6 +99,7 @@ stdenv.mkDerivation rec {
description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems"; description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ gador OPNA2608 ]; maintainers = with maintainers; [ gador OPNA2608 ];
platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" ]; mainProgram = "box64";
platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" "loongarch64-linux" "mips64el-linux" ];
}; };
} })