yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
clan-bot
2024-10-09 18:18:24 +00:00
parent 3275034448 09240fa3df
commit 727852275f
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/clan-app/default.nix
View File

@@ -73,13 +73,19 @@ python3.pkgs.buildPythonApplication rec {
src = source; src = source;
format = "pyproject"; format = "pyproject";
makeWrapperArgs = [ dontWrapGApps = true;
"--set FONTCONFIG_FILE ${fontconfig.out}/etc/fonts/fonts.conf" preFixup = ''
"--set WEBUI_PATH $out/${python3.sitePackages}/clan_app/.webui" 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 # This prevents problems with mixed glibc versions that might occur when the
# cli is called through a browser built against another glibc # 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 # Deps needed only at build time
nativeBuildInputs = [ nativeBuildInputs = [

1
pkgs/clan-app/shell.nix
View File

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