cargo-tauri: fix NVIDIA issue by disabling explicit sync (#506657)

This commit is contained in:
Aleksana
2026-04-06 00:25:27 +00:00
committed by GitHub
7 changed files with 3 additions and 40 deletions
+3
View File
@@ -41,6 +41,9 @@ makeSetupHook {
--prefix WEBKIT_GST_ALLOWED_URI_PROTOCOLS : "asset"
# Not picked up automatically by the wrappers from the propagatedBuildInputs.
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${cargo-tauri.gst-plugin}/lib/gstreamer-1.0/"
# fix NVIDIA issues with Tauri
# https://github.com/tauri-apps/tauri/issues/9394#issuecomment-3795449374
--set-default __NV_DISABLE_EXPLICIT_SYNC 1
)
'';
@@ -64,12 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
$out/share/applications/Cinny.desktop
'';
preFixup = ''
gappsWrapperArgs+=(
--set-default WEBKIT_DISABLE_DMABUF_RENDERER "1"
)
'';
nativeBuildInputs = [
cargo-tauri.hook
]
-7
View File
@@ -62,13 +62,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
doCheck = false; # This version's tests do not pass
# A fix for a problem with Tauri (tauri-apps/tauri#9304)
preFixup = ''
gappsWrapperArgs+=(
--set-default WEBKIT_DISABLE_DMABUF_RENDERER 1
)
'';
passthru.updateScript = nix-update-script {
extraArgs = [
"--subpackage"
@@ -135,8 +135,6 @@ rustPlatform.buildRustPackage rec {
preFixup = ''
gappsWrapperArgs+=(
# Otherwise blank screen, see https://github.com/tauri-apps/tauri/issues/9304
--set WEBKIT_DISABLE_DMABUF_RENDERER 1
--prefix PATH ":" ${
lib.makeBinPath [
zenity
@@ -65,11 +65,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
install -Dm644 "Flying Carpet/src-tauri/icons/128x128@2x.png" "$out/share/icons/hicolor/256x256@2/apps/FlyingCarpet.png"
'';
preFixup = ''
# https://github.com/tauri-apps/tauri/issues/9304
gappsWrapperArgs+=(--set WEBKIT_DISABLE_DMABUF_RENDERER 1)
'';
passthru.updateScript = nix-update-script { };
meta = {
-13
View File
@@ -18,10 +18,6 @@
moreutils,
jq,
gst_all_1,
# NOTE: this is enabled by default for better compatibility, but it may slow
# down performance.
withNvidiaFix ? true,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "readest";
@@ -95,15 +91,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpm setup-vendors
'';
preFixup = lib.optionalString withNvidiaFix ''
# fix Nvidia issues with Tauri
# https://github.com/tauri-apps/tauri/issues/9394
# https://github.com/tauri-apps/tauri/issues/9304
gappsWrapperArgs+=(
--set-default WEBKIT_DISABLE_DMABUF_RENDERER 1
)
'';
passthru.updateScript = nix-update-script { };
meta = {
-7
View File
@@ -138,13 +138,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
popd
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
wrapProgram $out/bin/yaak-app \
--inherit-argv0 \
--set-default WEBKIT_DISABLE_DMABUF_RENDERER 1 \
--set-default WEBKIT_DISABLE_COMPOSITING_MODE 1
'';
passthru.updateScript = nix-update-script { };
meta = {