Unverified Commit ffb85cf9 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

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

parents ef46594b 90f8af0c
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -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
      )
    '';

+0 −6
Original line number Diff line number Diff line
@@ -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
  ]
+0 −7
Original line number Diff line number Diff line
@@ -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"
+0 −2
Original line number Diff line number Diff line
@@ -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
+0 −5
Original line number Diff line number Diff line
@@ -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 = {
Loading