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