colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #170045 from AndersonTorres/new-misc

Browse Source 
x16: 38 -> 40
This commit is contained in:
Anderson Torres 2022-04-24 13:54:31 -03:00 committed by GitHub
commit 458a8fee0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/emulators/commanderx16/emulator.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "x16-emulator";
version = "38";
version = "40";
src = fetchFromGitHub {
owner = "commanderx16";
repo = pname;
rev = "r${version}";
sha256 = "WNRq/m97NpOBWIk6mtxBAKmkxCGWacWjXeOvIhBrkYE=";
hash = "sha256-7ZzVd2NJCFNAFrS2cj6bxcq/AzO5VakoFX9o1Ac9egg=";
};
dontConfigure = true;
@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -D --mode 755 --target-directory $out/bin/ x16emu
install -D --mode 444 --target-directory $out/share/doc/${pname} README.md
install -Dm 755 -t $out/bin/ x16emu
install -Dm 444 -t $out/share/doc/${pname} README.md
runHook postInstall
'';
@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
description = "The official emulator of CommanderX16 8-bit computer";
license = licenses.bsd2;
maintainers = with maintainers; [ AndersonTorres ];
platforms = SDL2.meta.platforms;
inherit (SDL2.meta) platforms;
};
passthru = {

18
pkgs/applications/emulators/commanderx16/rom.nix
View File

@ -2,20 +2,24 @@
, lib
, fetchFromGitHub
, cc65
, python3
}:
stdenv.mkDerivation rec {
pname = "x16-rom";
version = "38";
version = "40";
src = fetchFromGitHub {
owner = "commanderx16";
repo = pname;
rev = "r${version}";
sha256 = "xaqF0ppB7I7ST8Uh3jPbC14uRAb/WH21tHlNeTvYpoI=";
hash = "sha256-5oqttuTJiJOUENncOJipAar22OsI1uG3G69m+eYoSh0=";
};
nativeBuildInputs = [ cc65 ];
nativeBuildInputs = [
cc65
python3
];
postPatch = ''
patchShebangs scripts/
@ -25,8 +29,10 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -D --mode 444 --target-directory $out/share/${pname} build/x16/rom.bin
install -D --mode 444 --target-directory $out/share/doc/${pname} README.md
install -Dm 444 -t $out/share/${pname} build/x16/rom.bin
install -Dm 444 -t $out/share/doc/${pname} README.md
runHook postInstall
'';
@ -35,7 +41,7 @@ stdenv.mkDerivation rec {
description = "ROM file for CommanderX16 8-bit computer";
license = licenses.bsd2;
maintainers = with maintainers; [ AndersonTorres ];
platforms = cc65.meta.platforms;
inherit (cc65.meta) platforms;
};
passthru = {