Commit 90f8af0c authored by ccicnce113424's avatar ccicnce113424
Browse files

treewide: re-enable hardware renderer for tauri apps

https://github.com/tauri-apps/tauri/issues/9394#issuecomment-3795449374
suggested that disabling explicit sync on NVIDIA GPUs can solve
Tauri issues with less or no performance cost.
This was applied in 79cfdf. Therefore, this commit reverts the
workaround for NVIDIA GPUs in the affected apps, which should improve
performance on those platforms.
parent 964f593d
Loading
Loading
Loading
Loading
+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 = {
+0 −13
Original line number Diff line number Diff line
@@ -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 = {
Loading