From 605827cd4d8d3b24b05c2591aea886b465f5d991 Mon Sep 17 00:00:00 2001 From: Okina Matara <okinan@chiru.no> Date: Fri, 15 Jun 2018 22:23:12 -0500 Subject: [PATCH] mbga: 0.6.1 -> 0.6.3 --- pkgs/misc/emulators/mgba/default.nix | 34 +++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 64e29f59a186..755e2a2d72ba 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2 -, qtbase, qtmultimedia }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake, libzip, epoxy, ffmpeg +, imagemagick, SDL2, qtbase, qtmultimedia, qttools, libedit, minizip }: stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1fgxn3j6wc5mcgb81sc6fzy5m4saz02jz4zlms51dgycvy0flbz7"; + sha256 = "0m1pkxa6i94gq95cankv390wsbp88b3x41c7hf415rp9rkfq25vk"; }; + enableParallelBuilding = true; 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"; - }) + buildInputs = [ + libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip + qttools ]; + patches = [(fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/7f41dd354176b720c8e3310553c6b772278b9dca.patch"; + sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh"; + })]; + meta = with stdenv.lib; { homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; + longDescription = '' mGBA is a new Game Boy Advance emulator written in C. @@ -47,8 +44,9 @@ stdenv.mkDerivation rec { for tool-assist runners, and a modern feature set for emulators that older emulators may not support. ''; + license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; }