Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0580f9833cb0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 73050d3b207a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 1, 2018

  1. mgba: 0.6.0 -> 0.6.1 

    Also fixes build with qt 5.10.
    @bkchr
    bkchr committed Jan 1, 2018
    Copy the full SHA
    a7e54af View commit details

Commits on Jan 2, 2018

  1. Merge pull request #33292 from bkchr/mgba 

    mgba: 0.6.0 -> 0.6.1
    @adisbladis
    adisbladis authored Jan 2, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    73050d3 View commit details
Showing with 16 additions and 3 deletions.
  1. +16 −3 pkgs/misc/emulators/mgba/default.nix
19 changes: 16 additions & 3 deletions pkgs/misc/emulators/mgba/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";