From d70e11672f7f7f08255b7e30f621e8ac05f7af00 Mon Sep 17 00:00:00 2001
From: Kim Simmons <zoomulator@gmail.com>
Date: Thu, 21 Nov 2013 11:19:56 +0100
Subject: [PATCH 1/3] grafx2: new package

GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance. Specialized in 256-color drawing.
---
 pkgs/applications/graphics/grafx2/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/graphics/grafx2/default.nix

diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
new file mode 100644
index 00000000000..938f5bb497f
--- /dev/null
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkgconfig, lua5 }:
+
+stdenv.mkDerivation rec {
+
+  version = "2.4.2035";
+  name = "grafx2-${version}";
+
+  src = fetchurl {
+    url = "https://grafx2.googlecode.com/files/${name}-src.tgz";
+    sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
+  };
+
+  buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ];
+
+  buildPhase = ''
+    cd src
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p "$out"
+    make install prefix="$out"
+  '';
+
+  meta = {
+    description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance.";
+    homepage = http://code.google.co/p/grafx2/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = [ stdenv.lib.maintainers.zoomulator ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bef1cff60ed..26e0891c0b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1019,6 +1019,8 @@ let
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };
 
+  grafx2 = callPackage ../applications/graphics/grafx2 {};
+
   graphviz = callPackage ../tools/graphics/graphviz { };
 
   /* Readded by Michael Raskin. There are programs in the wild

From 1e44b5999603153e0c6ca08cf0d661aca559c180 Mon Sep 17 00:00:00 2001
From: Kim Simmons <zoomulator@gmail.com>
Date: Sat, 23 Nov 2013 09:44:49 +0100
Subject: [PATCH 2/3] grafx2: Some simplification in the package file.

---
 pkgs/applications/graphics/grafx2/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index 938f5bb497f..d6b2044bff3 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -12,10 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ];
 
-  buildPhase = ''
-    cd src
-    make
-  '';
+  preBuild = "cd src";
 
   installPhase = ''
     mkdir -p "$out"

From 1009ab8d68d73ac06429d5d84d6815e82aaabf7c Mon Sep 17 00:00:00 2001
From: Kim Simmons <zoomulator@gmail.com>
Date: Sun, 24 Nov 2013 16:59:23 +0100
Subject: [PATCH 3/3] Edit that was left out from the last commit.

---
 pkgs/applications/graphics/grafx2/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index d6b2044bff3..53f49c59b9a 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -14,10 +14,7 @@ stdenv.mkDerivation rec {
 
   preBuild = "cd src";
 
-  installPhase = ''
-    mkdir -p "$out"
-    make install prefix="$out"
-  '';
+  preInstall = '' mkdir -p "$out" '';
 
   meta = {
     description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance.";