From 0b70544284418aa0d3907e8357216fc0198d5c25 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 20 Feb 2025 22:46:54 +0100
Subject: [PATCH] lomiri.lomiri-system-settings-unwrapped: Fix ICU >74 compat,
 back out of 76

---
 .../lomiri-system-settings/default.nix          | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index 515561bb8bb1..2e9e3078c6cd 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   testers,
   accountsservice,
@@ -17,7 +18,7 @@
   gnome-desktop,
   gsettings-qt,
   gtk3,
-  icu,
+  icu75,
   intltool,
   json-glib,
   libqofono,
@@ -62,7 +63,17 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  patches = [ ./2000-Support-wrapping-for-Nixpkgs.patch ];
+  patches = [
+    # Fixes compat with newer ICU
+    # Remove when version > 1.3.0
+    (fetchpatch {
+      name = "0001-lomiri-system-settings-unwrapped-Unpin-Cxx-standard.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/c0b1c773237b28ea50850810b8844033b13fb666.patch";
+      hash = "sha256-M73gQxstKyuzzx1VxdOiNYyfQbSZPIy2gxiCtKcdS1M=";
+    })
+
+    ./2000-Support-wrapping-for-Nixpkgs.patch
+  ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
@@ -110,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-desktop
     gsettings-qt
     gtk3
-    icu
+    icu75
     json-glib
     polkit
     qtbase