Merge pull request 'Clan-app: use software rendering, simplify wrapper' (#2238) from hsjobeki/clan-core:hsjobeki-main into main

pkgs/clan-app/default.nix

@@ -73,13 +73,19 @@ python3.pkgs.buildPythonApplication rec {
   src = source;
   format = "pyproject";
 
-  makeWrapperArgs = [
-    "--set FONTCONFIG_FILE ${fontconfig.out}/etc/fonts/fonts.conf"
-    "--set WEBUI_PATH $out/${python3.sitePackages}/clan_app/.webui"
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=(
+      # Use software rendering for webkit, mesa causes random crashes with css.
+      --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+      --set FONTCONFIG_FILE ${fontconfig.out}/etc/fonts/fonts.conf
+      --set WEBUI_PATH "$out/${python3.sitePackages}/clan_app/.webui"
       # This prevents problems with mixed glibc versions that might occur when the
       # cli is called through a browser built against another glibc
-    "--unset LD_LIBRARY_PATH"
-  ];
+      --unset LD_LIBRARY_PATH
+      "''${gappsWrapperArgs[@]}"
+    )
+  '';
 
   # Deps needed only at build time
   nativeBuildInputs = [

pkgs/clan-app/shell.nix

@@ -51,6 +51,7 @@ mkShell {
     export GIT_ROOT=$(git rev-parse --show-toplevel)
     export PKG_ROOT=$GIT_ROOT/pkgs/clan-app
 
+    export WEBKIT_DISABLE_COMPOSITING_MODE=1
     # Add current package to PYTHONPATH
     export PYTHONPATH="$PKG_ROOT''${PYTHONPATH:+:$PYTHONPATH:}"