From 9ba7647102a4934e15424bf5850c9002c980ecd5 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Mon, 30 Dec 2024 17:52:14 +0300
Subject: [PATCH 1/3] text-engine: refactor

---
 pkgs/by-name/te/text-engine/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/te/text-engine/package.nix b/pkgs/by-name/te/text-engine/package.nix
index 434cdbb783269..554524c3605dd 100644
--- a/pkgs/by-name/te/text-engine/package.nix
+++ b/pkgs/by-name/te/text-engine/package.nix
@@ -1,16 +1,18 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchpatch,
+
+  gobject-introspection,
+  gtk4,
   meson,
   ninja,
-  json-glib,
-  gtk4,
-  libxml2,
-  gobject-introspection,
   pkg-config,
+
+  json-glib,
   libadwaita,
+  libxml2,
 }:
 
 stdenv.mkDerivation rec {
@@ -45,14 +47,14 @@ stdenv.mkDerivation rec {
     libxml2
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Rich text framework for GTK";
     mainProgram = "text-engine-demo";
     homepage = "https://github.com/mjakeman/text-engine";
-    license = with licenses; [
+    license = with lib.licenses; [
       mpl20
       lgpl21Plus
     ];
-    maintainers = with maintainers; [ foo-dogsquared ];
+    maintainers = with lib.maintainers; [ foo-dogsquared ];
   };
 }

From 81da8104df2775400e57e639041f181cc22d2982 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Mon, 30 Dec 2024 17:53:38 +0300
Subject: [PATCH 2/3] text-engine: 0.1.1 -> 0.1.1-unstable-2024-09-16

---
 pkgs/by-name/te/text-engine/package.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/te/text-engine/package.nix b/pkgs/by-name/te/text-engine/package.nix
index 554524c3605dd..345a3cbb9e5f5 100644
--- a/pkgs/by-name/te/text-engine/package.nix
+++ b/pkgs/by-name/te/text-engine/package.nix
@@ -17,22 +17,15 @@
 
 stdenv.mkDerivation rec {
   pname = "text-engine";
-  version = "0.1.1";
+  version = "0.1.1-unstable-2024-09-16";
+
   src = fetchFromGitHub {
     owner = "mjakeman";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes=";
+    rev = "4c26887556fd8e28211324c4058d49508eb5f557";
+    hash = "sha256-0rMBz2s3wYv7gZiJTj8rixWxBjT6Dd6SaINP8kDbTyw=";
   };
 
-  patches = [
-    # Fixes build with newer versions of clang
-    (fetchpatch {
-      url = "https://github.com/mjakeman/text-engine/commit/749c94d853c0b0e29e79a1b270ec61947b65c319.patch";
-      hash = "sha256-vs/a8IBovArw8tc1ZLUsaDHRVyA71KMB1NGENOKNOdk=";
-    })
-  ];
-
   nativeBuildInputs = [
     gobject-introspection
     gtk4

From 25ba6fc46300383e72713b37fc16cc2b91a7eb0d Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Mon, 30 Dec 2024 18:01:39 +0300
Subject: [PATCH 3/3] text-engine: remove the `json-glib` dependency

---
 pkgs/by-name/te/text-engine/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/text-engine/package.nix b/pkgs/by-name/te/text-engine/package.nix
index 345a3cbb9e5f5..6250ff9c88c30 100644
--- a/pkgs/by-name/te/text-engine/package.nix
+++ b/pkgs/by-name/te/text-engine/package.nix
@@ -36,10 +36,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libadwaita
-    json-glib
     libxml2
   ];
 
+  postPatch = ''
+    # See https://github.com/mjakeman/text-engine/pull/42
+    substituteInPlace src/meson.build \
+      --replace-fail "dependency('json-glib-1.0')," ""
+  '';
+
   meta = {
     description = "Rich text framework for GTK";
     mainProgram = "text-engine-demo";