1 files changed, 37 insertions, 9 deletions
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index 6620018c3376..1da4b040a75b 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -1,11 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu, makeWrapper
-, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas }:
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu,
+  makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas,
+  epoxy, gdk_pixbuf
+}:
 
 stdenv.mkDerivation rec {
-  name = "nestopia-1.46.2";
-  src = fetchurl {
-    url = https://github.com/rdanbrook/nestopia/archive/1.46.2.tar.gz;
-    sha256 = "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p";
+  version = "1.47";
+  name = "nestopia-${version}";
+
+  src = fetchFromGitHub {
+    owner = "rdanbrook";
+    repo = "nestopia";
+    rev = "${version}";
+    sha256 = "0frr0gvjh5mxzdhj0ii3sh671slgnzlm8naqlc4h87rx4p4sz2y2";
   };
 
   # nondeterministic failures when creating directories
@@ -13,8 +19,22 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ pkgconfig SDL2 alsaLib gtk3 mesa_glu mesa makeWrapper
-                  libarchive libao unzip xdg_utils gsettings_desktop_schemas ];
+  buildInputs = [
+    pkgconfig
+    SDL2
+    alsaLib
+    epoxy
+    gtk3
+    gdk_pixbuf
+    mesa_glu
+    mesa
+    makeWrapper
+    libarchive
+    libao
+    unzip
+    xdg_utils
+    gsettings_desktop_schemas
+  ];
 
   installPhase = ''
     mkdir -p $out/{bin,share/nestopia}
@@ -28,7 +48,15 @@ stdenv.mkDerivation rec {
      done
   '';
 
-  patches = [ ./build-fix.patch ];
+  patches = [
+    #(fetchpatch {
+    #  url = "https://github.com/rdanbrook/nestopia/commit/f4bc74ac4954328b25e961e7afb7337377084079.patch";
+    #  name = "gcc6.patch";
+    #  sha256 = "1jy0c85xsfk9hrv5a6v0kk48d94864qb62yyni9fp93kyl33y2p4";
+    #})
+    ./gcc6.patch
+    ./build-fix.patch
+  ];
 
   meta = {
     homepage = http://0ldsk00l.ca/nestopia/;