Merge pull request 'Update mgba to the development version' (#597) from mgba-dev into main
All checks were successful
update-riscv / pr (push) Successful in 4s
Hydra rainbow-resort.x86_64-linux Hydra build #18131 of nixos-config:pr585:rainbow-resort.x86_64-linux
Hydra packages.aarch64-linux.mgba-dev Hydra build #18129 of nixos-config:pr585:packages.aarch64-linux.mgba-dev
Hydra thinkrac.x86_64-linux Hydra build #18132 of nixos-config:pr585:thinkrac.x86_64-linux
Hydra packages.x86_64-linux.mgba-dev Hydra build #18130 of nixos-config:pr585:packages.x86_64-linux.mgba-dev
Hydra jobsets Hydra build #18158 of nixos-config:.jobsets:jobsets

Reviewed-on: #597
This commit is contained in:
Charlotte 🦝 Delenk 2024-10-20 05:56:37 +00:00
commit 49059718d4
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
5 changed files with 31 additions and 1 deletions

View file

@ -9,7 +9,7 @@ in {
home.packages = home.packages =
[ [
pkgs.prismlauncher pkgs.prismlauncher
pkgs.mgba pkgs.mgba-dev
] ]
++ ( ++ (
if system == "x86_64-linux" if system == "x86_64-linux"

View file

@ -280,6 +280,7 @@ rec {
plover-plugin-modal-dictionary plover-plugin-modal-dictionary
plover-plugin-stitching plover-plugin-stitching
plover-plugin-lapwing-aio plover-plugin-lapwing-aio
mgba-dev
; ;
}; };
perSystem = { perSystem = {

View file

@ -63,6 +63,7 @@ inputs: system: self: prev: let
asar-asm = self.callPackage ../packages/compiler/asar {}; asar-asm = self.callPackage ../packages/compiler/asar {};
bsnes-plus = self.libsForQt5.callPackage ../packages/emulator/bsnes-plus {}; bsnes-plus = self.libsForQt5.callPackage ../packages/emulator/bsnes-plus {};
yiffstash = self.python3Packages.callPackage ../packages/python/yiffstash.nix {}; yiffstash = self.python3Packages.callPackage ../packages/python/yiffstash.nix {};
mgba-dev = self.libsForQt5.callPackage ../packages/emulator/mgba-dev {};
}; };
perSystem = { perSystem = {
aarch64-linux = { aarch64-linux = {

View file

@ -0,0 +1,16 @@
{
mgba,
fetchFromGitHub,
}: let
source = builtins.fromJSON (builtins.readFile ./source.json);
in
mgba.overrideAttrs (super: {
version = source.date;
src = fetchFromGitHub {
owner = "mgba-emu";
repo = "mgba";
inherit (source) rev sha256;
};
passthru.updateScript = [../../scripts/update-git.sh "https://github.com/mgba-emu/mgba" "emulator/mgba-dev/source.json"];
})

View file

@ -0,0 +1,12 @@
{
"url": "https://github.com/mgba-emu/mgba",
"rev": "afff68cfc0731c441ececa83bf43c3d8bebe5c5a",
"date": "2024-10-11T21:52:48-07:00",
"path": "/nix/store/07x809rwbmxsxbax2dbmsr0cwi8189sr-mgba",
"sha256": "1cyj4da8skk2pn9gxwc0lq0wk6pmxj3bgv4iay4b81mmgq5p84q0",
"hash": "sha256-ABN0C361BrSIV5Hst4bs9ZrJAaaA8f6SvWJOjVQj0rM=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}