From b029bc6bdc07cb0d3b71ac441e4e7129524dc3d3 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Wed, 9 Oct 2024 16:35:50 +0200
Subject: [PATCH] Clan-app: use software rendering, simplify wrapper

---
 pkgs/clan-app/default.nix | 20 +++++++++++++-------
 pkgs/clan-app/shell.nix   |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/clan-app/default.nix b/pkgs/clan-app/default.nix
index bdc4b6f16..cf600cb8d 100644
--- a/pkgs/clan-app/default.nix
+++ b/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"
-    # 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"
-  ];
+  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
+      "''${gappsWrapperArgs[@]}"
+    )
+  '';
 
   # Deps needed only at build time
   nativeBuildInputs = [
diff --git a/pkgs/clan-app/shell.nix b/pkgs/clan-app/shell.nix
index 36e034d7f..0ee55486a 100644
--- a/pkgs/clan-app/shell.nix
+++ b/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:}"