From 29464942e2b19977e1ffb98d5b807ed131f35df9 Mon Sep 17 00:00:00 2001
From: "B. Kelly" <bk@ancilla.ca>
Date: Tue, 21 Apr 2020 09:00:09 -0400
Subject: [PATCH 1/3] Add ToxicFrog to maintainer list

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e436ce47eec3..ff7df97e4b8f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10644,6 +10644,12 @@
     github = "totoroot";
     githubId = 39650930;
   };
+  ToxicFrog = {
+    email = "toxicfrog@ancilla.ca";
+    github = "ToxicFrog";
+    githubId = 90456;
+    name = "Rebecca (Bex) Kelly";
+  };
   travisbhartwell = {
     email = "nafai@travishartwell.net";
     github = "travisbhartwell";

From 277d1a156909340a025edf242e8915d570df350b Mon Sep 17 00:00:00 2001
From: Rebecca Kelly <bk@ancilla.ca>
Date: Sat, 3 Jul 2021 08:49:54 -0400
Subject: [PATCH 2/3] openttd-grfcodec: init at 6.0.6+git20210310

N.b. 6.0.6 release version is ~5 years old now, and doesn't build under gcc10
---
 pkgs/games/openttd/grfcodec.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/games/openttd/grfcodec.nix

diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/games/openttd/grfcodec.nix
new file mode 100644
index 000000000000..544cf4f06c43
--- /dev/null
+++ b/pkgs/games/openttd/grfcodec.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, fetchFromGitHub, boost, cmake, git }:
+
+stdenv.mkDerivation rec {
+  pname = "openttd-grfcodec";
+  version = "unstable-2021-03-10";
+
+  src = fetchFromGitHub {
+    owner = "OpenTTD";
+    repo = "grfcodec";
+    rev = "045774dee7cab1a618a3e0d9b39bff78a12b6efa";
+    sha256 = "0b4xnnkqc01d3r834lhkq744ymar6c8iyxk51wc4c7hvz0vp9vmy";
+  };
+
+  buildInputs = [boost];
+  nativeBuildInputs = [cmake git];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a grfcodec grfid grfstrip nforenum $out/bin/
+  '';
+
+  meta = with lib; {
+    description = "Low-level (dis)assembler and linter for OpenTTD GRF files";
+    homepage    = "http://openttd.org/";
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ ToxicFrog ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18f860ffc514..a87846b8300d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28979,6 +28979,7 @@ in
       static = true;
     };
   };
+  openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {};
 
   opentyrian = callPackage ../games/opentyrian { };
 

From 82c4085089b1ec7e5889bf2e9ef31867f48e8a19 Mon Sep 17 00:00:00 2001
From: Rebecca Kelly <bk@ancilla.ca>
Date: Sat, 3 Jul 2021 08:50:21 -0400
Subject: [PATCH 3/3] openttd-nml: init at 0.5.3

---
 pkgs/games/openttd/nml.nix      | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/games/openttd/nml.nix

diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix
new file mode 100644
index 000000000000..094330faffbb
--- /dev/null
+++ b/pkgs/games/openttd/nml.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "openttd-nml";
+  version = "0.5.3";
+
+  src = fetchFromGitHub {
+    owner = "OpenTTD";
+    repo = "nml";
+    rev = version;
+    sha256 = "0kfnkshff3wrxsj1wpfbbw2mmgww2q80v63p5d2pp1f38x8j33w9";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ply pillow];
+
+  meta = with lib; {
+    description = "Compiler for OpenTTD NML files";
+    homepage    = "http://openttdcoop.org/";
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ ToxicFrog ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a87846b8300d..480506b29087 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28980,6 +28980,7 @@ in
     };
   };
   openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {};
+  openttd-nml = callPackage ../games/openttd/nml.nix {};
 
   opentyrian = callPackage ../games/opentyrian { };