From f2ce8e7d79460ad9d3fc7e87f789feda1151fd5b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 5 Jan 2025 14:19:49 +0100 Subject: [PATCH] lomiri.morph-browser: Drop workaround for LAL crash on Lomiri startup --- pkgs/desktops/lomiri/applications/morph-browser/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index dd1390ce5475..ce8a0c73ab6d 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -52,12 +52,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \ --replace '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" - # We normally don't want to use absolute paths in desktop file, but this one is special - # There appears to be some issue in lomiri-app-launch's lookup of relative Icon entries (while lomiri is starting up?) - # that makes the session segfault. - # As a compromise, hardcode /run/current-system substituteInPlace src/app/webbrowser/morph-browser.desktop.in.in \ - --replace 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=/run/current-system/sw/share/icons/hicolor/scalable/apps/morph-browser.svg' \ + --replace 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=morph-browser' \ --replace 'X-Lomiri-Splash-Image=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/morph-browser.svg' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''