From 8cc7bfe625805ae412eb091bf08c457b527a46ee Mon Sep 17 00:00:00 2001
From: laalsaas <laalsaas@systemli.org>
Date: Sun, 18 Aug 2024 12:30:02 +0200
Subject: [PATCH 1/2] maintainers: Add istoph and textshell

I did this on their behalf, they'll approve the PR.
---
 maintainers/maintainer-list.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a835915dae86..9ba533ce8ad3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8940,6 +8940,12 @@
     githubId = 13622947;
     keys = [ { fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; } ];
   };
+  istoph = {
+    email = "chr@istoph.de";
+    name = "Christoph Hüffelmann";
+    github = "istoph";
+    githubId = 114227790;
+  };
   ius = {
     email = "j.de.gram@gmail.com";
     name = "Joerie de Gram";
@@ -20354,6 +20360,12 @@
     githubId = 27386;
     name = "Milan Svoboda";
   };
+  textshell = {
+    email = "textshell@uchuujin.de";
+    github = "textshell";
+    githubId = 6579711;
+    name = "Martin Hostettler";
+  };
   tfc = {
     email = "jacek@galowicz.de";
     matrix = "@jonge:ukvly.org";

From 8e014cc630385e71fd28eedb498ea675fe06d140 Mon Sep 17 00:00:00 2001
From: laalsaas <laalsaas@systemli.org>
Date: Sun, 18 Aug 2024 12:33:43 +0200
Subject: [PATCH 2/2] termpaint: init at 0.3.0

---
 .../0001-meson.build-use-prefix.patch         | 25 ++++++++++
 pkgs/by-name/te/termpaint/package.nix         | 50 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch
 create mode 100644 pkgs/by-name/te/termpaint/package.nix

diff --git a/pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch b/pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch
new file mode 100644
index 000000000000..e645f8c61d4a
--- /dev/null
+++ b/pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch
@@ -0,0 +1,25 @@
+From 6275687b748bed9a6148164b085b82840b5e09c6 Mon Sep 17 00:00:00 2001
+From: laalsaas <laalsaas@systemli.org>
+Date: Sun, 18 Aug 2024 11:59:13 +0200
+Subject: [PATCH] meson.build: use-prefix
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 8a0c39c..5eb2435 100644
+--- a/meson.build
++++ b/meson.build
+@@ -111,7 +111,7 @@ main_lib_files = [
+ ]
+ 
+ main_lib_cargs += '-DTERMPAINT_RESCUE_EMBEDDED'
+-main_lib_cargs += '-DTERMPAINT_RESCUE_PATH="@0@"'.format(get_option('ttyrescue-path'))
++main_lib_cargs += '-DTERMPAINT_RESCUE_PATH="@0@"'.format(get_option('prefix') / get_option('ttyrescue-path'))
+ main_lib = library('termpaint', main_lib_files,
+   dependencies: lib_rt,
+   c_args: main_lib_cargs,
+-- 
+2.45.1
+
diff --git a/pkgs/by-name/te/termpaint/package.nix b/pkgs/by-name/te/termpaint/package.nix
new file mode 100644
index 000000000000..acd730dcf5bc
--- /dev/null
+++ b/pkgs/by-name/te/termpaint/package.nix
@@ -0,0 +1,50 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  cmake,
+  pkg-config,
+  python3,
+}:
+stdenv.mkDerivation (final: {
+  name = "termpaint";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "termpaint";
+    repo = "termpaint";
+    rev = final.version;
+    hash = "sha256-AsbUJjz51pedmemI0racMgWRzpbIeNJrK/walFUniR4=";
+  };
+
+  patches = [ ./0001-meson.build-use-prefix.patch ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+  ];
+
+  mesonFlags = [
+    "-Dttyrescue-fexec-blob=false"
+    "-Dtools-path=libexec/"
+    "-Dttyrescue-path=libexec/"
+    "-Dttyrescue-install=true"
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Low level terminal interface library";
+    homepage = "https://github.com/termpaint/termpaint";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [
+      istoph
+      textshell
+    ];
+  };
+})