diff --git a/pkgs/by-name/va/vapoursynth/editor.nix b/pkgs/by-name/va/vapoursynth-editor/package.nix similarity index 84% rename from pkgs/by-name/va/vapoursynth/editor.nix rename to pkgs/by-name/va/vapoursynth-editor/package.nix index 52b1a8b13154..91e130373c43 100644 --- a/pkgs/by-name/va/vapoursynth/editor.nix +++ b/pkgs/by-name/va/vapoursynth-editor/package.nix @@ -6,22 +6,19 @@ runCommand, python3, vapoursynth, - qmake, - wrapQtAppsHook, - qtbase, - qtwebsockets, + 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 = '' @@ -30,16 +27,20 @@ let ''; nativeBuildInputs = [ - qmake - wrapQtAppsHook + qt6.qmake + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase vapoursynth - 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65e8c473b90c..67006642952f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5484,8 +5484,6 @@ with pkgs; ; }; - vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; - enchant = enchant_2; factorPackages-0_99 = callPackage ./factor-packages.nix {