From d75f56b230fffead02c37a6a52ac9e86cbaaea19 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 16 Sep 2025 22:48:28 +0800
Subject: [PATCH 1/2] cjs: Backport fixes to support GLib 2.86.0 typelibs

---
 pkgs/by-name/cj/cjs/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix
index ac0a5d2f22e25..70a9076ae0e97 100644
--- a/pkgs/by-name/cj/cjs/package.nix
+++ b/pkgs/by-name/cj/cjs/package.nix
@@ -19,13 +19,16 @@
 
 stdenv.mkDerivation rec {
   pname = "cjs";
-  version = "128.0";
+  version = "128.0-unstable-2025-09-15";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cjs";
-    rev = version;
-    hash = "sha256-B9N/oNRvsnr3MLkpcH/aBST6xOJSFdvSUFuD6EldE38=";
+    # Backport fixes to support GLib 2.86.0 typelibs
+    # nixpkgs-update: no auto update
+    # https://github.com/linuxmint/cjs/issues/130
+    rev = "1f39576bafe6bc05bce960e590dc743dd7990e39";
+    hash = "sha256-drKLaTZLIZfPIhcVcCAB48PdM2b0GNLe5xrHGBysVmM=";
   };
 
   outputs = [

From 41c50495b26b1253eff4fd6806f9eacf91d05f5e Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 16 Sep 2025 23:03:12 +0800
Subject: [PATCH 2/2] cinnamon: Use DesktopAppInfo form GioUnix

---
 pkgs/by-name/ci/cinnamon/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
index 626661eafd10f..3e693757909d6 100644
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -10,6 +10,7 @@
   cjs,
   evolution-data-server,
   fetchFromGitHub,
+  fetchpatch,
   gcr,
   gdk-pixbuf,
   gettext,
@@ -87,6 +88,17 @@ stdenv.mkDerivation rec {
   patches = [
     ./use-sane-install-dir.patch
     ./libdir.patch
+
+    # js: Use DesktopAppInfo form GioUnix, not Gio
+    # https://github.com/linuxmint/cinnamon/pull/13091
+    (fetchpatch {
+      url = "https://github.com/linuxmint/cinnamon/commit/fa3aef20533af4499fb1161011e62e048bbdc396.patch";
+      hash = "sha256-qhgBniaUE/8q9BQ+EXcY7BF6eMJg+wC7EYgktwAMbwM=";
+    })
+    (fetchpatch {
+      url = "https://github.com/linuxmint/cinnamon/commit/330b9ff19f33ec1e94e36048ca46011404f796b4.patch";
+      hash = "sha256-YEQG6C4tx2T3wMfCLZXPFynAzEeIE1eVoadWVENZDFc=";
+    })
   ];
 
   buildInputs = [