Merge pull request #185744 from AndersonTorres/x16

X16 updates
This commit is contained in:
Anderson Torres 2022-08-09 01:00:29 -03:00 committed by GitHub
commit 9f15d6c3a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 20 deletions

View file

@ -4,15 +4,15 @@
, SDL2
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "x16-emulator";
version = "40";
version = "41";
src = fetchFromGitHub {
owner = "commanderx16";
repo = pname;
rev = "r${version}";
hash = "sha256-7ZzVd2NJCFNAFrS2cj6bxcq/AzO5VakoFX9o1Ac9egg=";
repo = "x16-emulator";
rev = "r${finalAttrs.version}";
hash = "sha256-pnWqtSXQzUfQ8ADIXL9r2YjuBwHDQ2NAffAEFCN5Qzw=";
};
dontConfigure = true;
@ -23,23 +23,24 @@ stdenv.mkDerivation rec {
runHook preInstall
install -Dm 755 -t $out/bin/ x16emu
install -Dm 444 -t $out/share/doc/${pname} README.md
install -Dm 444 -t $out/share/doc/x16-emulator/ README.md
runHook postInstall
'';
meta = with lib; {
description = "The official emulator of CommanderX16 8-bit computer";
homepage = "https://www.commanderx16.com/forum/index.php?/home/";
description = "The official emulator of CommanderX16 8-bit computer";
license = licenses.bsd2;
maintainers = with maintainers; [ AndersonTorres ];
mainProgram = "x16emu";
inherit (SDL2.meta) platforms;
broken = with stdenv; isDarwin && isAarch64;
};
passthru = {
# upstream project recommends emulator and rom synchronized;
# upstream project recommends emulator and rom to be synchronized;
# passing through the version is useful to ensure this
inherit version;
inherit (finalAttrs) version;
};
}
})

View file

@ -5,15 +5,15 @@
, python3
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "x16-rom";
version = "40";
version = "41";
src = fetchFromGitHub {
owner = "commanderx16";
repo = pname;
rev = "r${version}";
hash = "sha256-5oqttuTJiJOUENncOJipAar22OsI1uG3G69m+eYoSh0=";
repo = "x16-rom";
rev = "r${finalAttrs.version}";
hash = "sha256-kowdyUVi3hliqkL8VQo5dS3Dpxd4LQi5+5brkdnv0lE=";
};
nativeBuildInputs = [
@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -Dm 444 -t $out/share/${pname} build/x16/rom.bin
install -Dm 444 -t $out/share/doc/${pname} README.md
install -Dm 444 -t $out/share/x16-rom/ build/x16/rom.bin
install -Dm 444 -t $out/share/doc/x16-rom/ README.md
runHook postInstall
'';
@ -42,11 +42,12 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ AndersonTorres ];
inherit (cc65.meta) platforms;
broken = with stdenv; isDarwin && isAarch64;
};
passthru = {
# upstream project recommends emulator and rom synchronized;
# upstream project recommends emulator and rom to be synchronized;
# passing through the version is useful to ensure this
inherit version;
inherit (finalAttrs) version;
};
}
})