Commit 0b705442 authored by OPNA2608's avatar OPNA2608
Browse files

lomiri.lomiri-system-settings-unwrapped: Fix ICU >74 compat, back out of 76

parent f2acf15f

pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix

+14 −3
Original line number Diff line number Diff line
@@ -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