From aa2a17ea095e66271317907ad48a589e6b8eb0b2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 11 Dec 2025 22:25:15 +0100 Subject: [PATCH] lomiri.morph-browser: 1.99.0 -> 1.99.1 --- .../applications/morph-browser/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index a1c60f8fd7e7..8010535786df 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -2,13 +2,13 @@ stdenv, lib, fetchFromGitLab, - fetchpatch2, gitUpdater, nixosTests, cmake, ctestCheckHook, gettext, libapparmor, + libpsl, lomiri-action-api, lomiri-content-hub, lomiri-ui-extras, @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "morph-browser"; - version = "1.99.0"; + version = "1.99.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/morph-browser"; tag = finalAttrs.version; - hash = "sha256-fuemZhBMtx6MiQGsdAlsRkK4uJJvIOjcSSc9Z1nGeXU="; + hash = "sha256-RCyauz7qBNzq7Aqr22NBSAgVSBsFpXpNb+aVo73CBQU="; }; outputs = [ @@ -45,15 +45,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Fix an issue with asset installation & loading - # Remove when version > 1.99.0 - (fetchpatch2 { - url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/512a7dceebd4665856c4877c02d5d01fd8411574.diff"; - hash = "sha256-yincXEYXsfOJz7cpotD4OX90kwiDgk9E7FL1MP4iNuM="; - }) - ]; - postPatch = '' substituteInPlace src/Morph/CMakeLists.txt \ --replace-fail '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt''${QT_VERSION_MAJOR}/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" @@ -86,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libapparmor + libpsl qtbase qtdeclarative qtwebengine