From c97205806d6191b0ab4d27a63232f9a39d9d1b34 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 18 Apr 2023 00:53:55 -0400
Subject: [PATCH] grafx2: 2.4.2035 -> 2.8.3091

---
 pkgs/applications/graphics/grafx2/default.nix | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index db297f70095a..26454897ddab 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -1,29 +1,41 @@
-{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkg-config, lua5 }:
+{ lib
+, stdenv
+, fetchurl
+, SDL
+, SDL_image
+, SDL_ttf
+, fontconfig
+, libpng
+, libtiff
+, lua5
+, pkg-config
+, zlib
+}:
 
 stdenv.mkDerivation rec {
-
-  version = "2.4.2035";
+  version = "2.8.3091";
   pname = "grafx2";
 
   src = fetchurl {
-    url = "https://grafx2.googlecode.com/files/${pname}-${version}-src.tgz";
-    sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
+    url = "https://pulkomandy.tk/projects/GrafX2/downloads/65";
+    name = "${pname}-${version}.tar.gz";
+    hash = "sha256-KdY7GUhQp/Q7t/ktLPGxI66ZHy2gDAffn2yB5pmcJCM=";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ];
+  buildInputs = [
+    SDL
+    SDL_image
+    SDL_ttf
+    fontconfig
+    libpng
+    libtiff
+    lua5
+    zlib
+  ];
 
-  preBuild = "cd src";
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of
-  #     `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  preInstall = '' mkdir -p "$out" '';
-
-  installPhase = ''make install prefix="$out"'';
+  makeFlags = [ "-C src" ];
+  installFlags = [ "-C src" "PREFIX=$(out)" ];
 
   meta = {
     description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance";
@@ -31,5 +43,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = [];
+    mainProgram = "grafx2-sdl";
   };
 }