From 27f6a1807f9de49b2507d20785523796d955f677 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 15 Jan 2025 23:36:08 +0100 Subject: [PATCH] lomiri.lomiri-indicator-network: 1.0.2 -> 1.1.0 --- .../lomiri-indicator-network/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 58ca6d208779..4cd9ea9e7db3 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-indicator-network"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-indicator-network"; - rev = finalAttrs.version; - hash = "sha256-9AQCWCZFbt4XcmKsjoTXJlWOm02/kBhpPxbHRtftNFM="; + tag = finalAttrs.version; + hash = "sha256-pN5M5VKRyo6csmI/vrmp/bonnap3oEdPuHAUJ1PjdOs="; }; outputs = [ @@ -49,21 +49,16 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Move to new lomiri-indicators target - # Remove when version > 1.0.2 - (fetchpatch { - name = "0001-lomiri-indicator-network-lomiri-indicators-target.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/commit/b1e1f7da4b298964eba3caea37b1dace7a6182e9.patch"; - hash = "sha256-pZKpEn2OJtB1pG/U+6IjtPGiOchRDhdbBHEZbTW7Lx0="; - }) - ]; - postPatch = '' # Override original prefixes substituteInPlace data/CMakeLists.txt \ --replace-fail 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=''${CMAKE_INSTALL_FULL_SYSCONFDIR})' \ --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' + + # Fix typo + # Remove when https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/merge_requests/131 merged & in release + substituteInPlace src/indicator/nmofono/wwan/modem.cpp \ + --replace-fail 'if (m_isManaged = managed)' 'if (m_isManaged == managed)' ''; strictDeps = true; @@ -115,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ - --replace '/bin/false' '${lib.getExe' coreutils "false"}' + --replace-fail '/bin/false' '${lib.getExe' coreutils "false"}' ''; passthru = {