From a7e54afc4d1203bfd7e92c6a466fd394281b9dc1 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Mon, 1 Jan 2018 21:07:59 +0100
Subject: mgba: 0.6.0 -> 0.6.1

Also fixes build with qt 5.10.
---
 pkgs/misc/emulators/mgba/default.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc/emulators/mgba')

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";
-- 
cgit 1.4.1