git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #170045 from AndersonTorres/new-misc

x16: 38 -> 40

commit458a8fee0d3071a44927b3be1f4c78cde3da2061 authorAnderson Torres <torres.anderson.85@protonmail.com> dateSun 24 Apr 2022, 13:54 (5 years ago) parent8b0c96397165f3
2 files changed+19−11
compare with master
unifiedsplit
pkgs/applications/emulators/commanderx16/emulator.nix+7−5 pkgs/applications/emulators/commanderx16/rom.nix+12−6
pkgs/applications/emulators/commanderx16/emulator.nix+7−5
@@ -6,13 +6,13 @@
66
77stdenv.mkDerivation rec {
88 pname = "x16-emulator";
9− version = "38";
9+ version = "40";
1010
1111 src = fetchFromGitHub {
1212 owner = "commanderx16";
1313 repo = pname;
1414 rev = "r${version}";
15− sha256 = "WNRq/m97NpOBWIk6mtxBAKmkxCGWacWjXeOvIhBrkYE=";
15+ hash = "sha256-7ZzVd2NJCFNAFrS2cj6bxcq/AzO5VakoFX9o1Ac9egg=";
1616 };
1717
1818 dontConfigure = true;
@@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
2121
2222 installPhase = ''
2323 runHook preInstall
24− install -D --mode 755 --target-directory $out/bin/ x16emu
25− install -D --mode 444 --target-directory $out/share/doc/${pname} README.md
24+
25+ install -Dm 755 -t $out/bin/ x16emu
26+ install -Dm 444 -t $out/share/doc/${pname} README.md
27+
2628 runHook postInstall
2729 '';
2830
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
3133 description = "The official emulator of CommanderX16 8-bit computer";
3234 license = licenses.bsd2;
3335 maintainers = with maintainers; [ AndersonTorres ];
34− platforms = SDL2.meta.platforms;
36+ inherit (SDL2.meta) platforms;
3537 };
3638
3739 passthru = {
pkgs/applications/emulators/commanderx16/rom.nix+12−6
@@ -2,20 +2,24 @@
22, lib
33, fetchFromGitHub
44, cc65
5+, python3
56}:
67
78stdenv.mkDerivation rec {
89 pname = "x16-rom";
9− version = "38";
10+ version = "40";
1011
1112 src = fetchFromGitHub {
1213 owner = "commanderx16";
1314 repo = pname;
1415 rev = "r${version}";
15− sha256 = "xaqF0ppB7I7ST8Uh3jPbC14uRAb/WH21tHlNeTvYpoI=";
16+ hash = "sha256-5oqttuTJiJOUENncOJipAar22OsI1uG3G69m+eYoSh0=";
1617 };
1718
18− nativeBuildInputs = [ cc65 ];
19+ nativeBuildInputs = [
20+ cc65
21+ python3
22+ ];
1923
2024 postPatch = ''
2125 patchShebangs scripts/
@@ -25,8 +29,10 @@ stdenv.mkDerivation rec {
2529
2630 installPhase = ''
2731 runHook preInstall
28− install -D --mode 444 --target-directory $out/share/${pname} build/x16/rom.bin
29− install -D --mode 444 --target-directory $out/share/doc/${pname} README.md
32+
33+ install -Dm 444 -t $out/share/${pname} build/x16/rom.bin
34+ install -Dm 444 -t $out/share/doc/${pname} README.md
35+
3036 runHook postInstall
3137 '';
3238
@@ -35,7 +41,7 @@ stdenv.mkDerivation rec {
3541 description = "ROM file for CommanderX16 8-bit computer";
3642 license = licenses.bsd2;
3743 maintainers = with maintainers; [ AndersonTorres ];
38− platforms = cc65.meta.platforms;
44+ inherit (cc65.meta) platforms;
3945 };
4046
4147 passthru = {