diff options
author | adisbladis <adisbladis@gmail.com> | 2018-01-02 02:23:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-02 02:23:38 +0100 |
commit | 73050d3b207a697b30c0c2d38fb0a0ae1b54b28e (patch) | |
tree | f8084d8bf5bde9067592fa943f3142217ec293c2 /pkgs/misc | |
parent | 0580f9833cb0b4d7647e4538f61fd93117af5450 (diff) | |
parent | a7e54afc4d1203bfd7e92c6a466fd394281b9dc1 (diff) | |
download | nixlib-73050d3b207a697b30c0c2d38fb0a0ae1b54b28e.tar nixlib-73050d3b207a697b30c0c2d38fb0a0ae1b54b28e.tar.gz nixlib-73050d3b207a697b30c0c2d38fb0a0ae1b54b28e.tar.bz2 nixlib-73050d3b207a697b30c0c2d38fb0a0ae1b54b28e.tar.lz nixlib-73050d3b207a697b30c0c2d38fb0a0ae1b54b28e.tar.xz nixlib-73050d3b207a697b30c0c2d38fb0a0ae1b54b28e.tar.zst nixlib-73050d3b207a697b30c0c2d38fb0a0ae1b54b28e.zip |
Merge pull request #33292 from bkchr/mgba
mgba: 0.6.0 -> 0.6.1
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/mgba/default.nix | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index f14608fd93ef..64e29f59a186 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,21 +1,34 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2 , qtbase, qtmultimedia }: stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1kzb6zj2lxfaiyfq9h7q26fh7xh1ggybmh5pin5rcgs7jyygrsjb"; + sha256 = "1fgxn3j6wc5mcgb81sc6fzy5m4saz02jz4zlms51dgycvy0flbz7"; }; nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia ]; + patches = [ + (fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/e31373560535203d826687044290a4994706c2dd.patch"; + sha256 = "07582vj0fqgsgryx28pnshiwri9dn88l1rr4vkraib7bzx7cs4f9"; + }) + + (fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/baabe0090bb1fd5997e531fd9568c2de09b5fc21.patch"; + sha256 = "1kv9dxxna35s050q9af9nzskplz2x1aq8avg0ihbznhxjl8vmxz9"; + }) + ]; + meta = with stdenv.lib; { homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; |