From 1ff66ad8298c6e9e9fee68f594c92b3c08ae2aac Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 30 May 2026 16:20:19 +0200
Subject: [PATCH 1/2] vapoursynth-editor: migrate to pkgs/by-name

---
 .../editor.nix => vapoursynth-editor/package.nix}   | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/by-name/va/{vapoursynth/editor.nix => vapoursynth-editor/package.nix} (95%)

diff --git a/pkgs/by-name/va/vapoursynth/editor.nix b/pkgs/by-name/va/vapoursynth-editor/package.nix
similarity index 95%
rename from pkgs/by-name/va/vapoursynth/editor.nix
rename to pkgs/by-name/va/vapoursynth-editor/package.nix
index 52b1a8b13154..6447ca94970b 100644
--- a/pkgs/by-name/va/vapoursynth/editor.nix
+++ b/pkgs/by-name/va/vapoursynth-editor/package.nix
@@ -6,10 +6,7 @@
   runCommand,
   python3,
   vapoursynth,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtwebsockets,
+  qt5,
 }:
 
 let
@@ -30,14 +27,14 @@ let
     '';
 
     nativeBuildInputs = [
-      qmake
-      wrapQtAppsHook
+      qt5.qmake
+      qt5.wrapQtAppsHook
     ];
 
     buildInputs = [
-      qtbase
+      qt5.qtbase
       vapoursynth
-      qtwebsockets
+      qt5.qtwebsockets
     ];
 
     dontWrapQtApps = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17754b9aa31d..2e5bffafd4bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5516,8 +5516,6 @@ with pkgs;
       ;
   };
 
-  vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { };
-
   enchant = enchant_2;
 
   factorPackages-0_99 = callPackage ./factor-packages.nix {

From 7f09b1c6cd2f24fdb967cc20fb6285a546e807f2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 30 May 2026 17:09:44 +0200
Subject: [PATCH 2/2] vapoursynth-editor: R19-mod-4 -> R19-mod-6.8

---
 .../by-name/va/vapoursynth-editor/package.nix | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/va/vapoursynth-editor/package.nix b/pkgs/by-name/va/vapoursynth-editor/package.nix
index 6447ca94970b..91e130373c43 100644
--- a/pkgs/by-name/va/vapoursynth-editor/package.nix
+++ b/pkgs/by-name/va/vapoursynth-editor/package.nix
@@ -6,19 +6,19 @@
   runCommand,
   python3,
   vapoursynth,
-  qt5,
+  qt6,
 }:
 
 let
   unwrapped = stdenv.mkDerivation rec {
     pname = "vapoursynth-editor";
-    version = "R19-mod-4";
+    version = "R19-mod-6.8";
 
     src = fetchFromGitHub {
       owner = "YomikoR";
       repo = "vapoursynth-editor";
-      rev = lib.toLower version;
-      hash = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg=";
+      tag = version;
+      hash = "sha256-eSdyhKRNsZeSRqkn5SzbB5YRuKehgCJD03PYiD5zQ/Y=";
     };
 
     postPatch = ''
@@ -27,16 +27,20 @@ let
     '';
 
     nativeBuildInputs = [
-      qt5.qmake
-      qt5.wrapQtAppsHook
+      qt6.qmake
+      qt6.wrapQtAppsHook
     ];
 
     buildInputs = [
-      qt5.qtbase
+      qt6.qtbase
       vapoursynth
-      qt5.qtwebsockets
+      qt6.qtwebsockets
+      qt6.qt5compat
     ];
 
+    # ../../common-src/helpers.h:4:10: fatal error: VapourSynth4.h: No such file or directory
+    env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude vapoursynth}/include/vapoursynth";
+
     dontWrapQtApps = true;
 
     preConfigure = "cd pro";