diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/by-name/ol/olive-editor/package.nix similarity index 89% rename from pkgs/applications/video/olive-editor/default.nix rename to pkgs/by-name/ol/olive-editor/package.nix index 787062bd3178..1be1af06b3b9 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/by-name/ol/olive-editor/package.nix @@ -9,14 +9,11 @@ opencolorio, ffmpeg_6, cmake, - wrapQtAppsHook, openimageio, openexr, portaudio, imath, - qtwayland, - qtmultimedia, - qttools, + qt6, }: let @@ -71,7 +68,7 @@ stdenv.mkDerivation { pkg-config which cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ @@ -82,18 +79,18 @@ stdenv.mkDerivation { imath openexr portaudio - qtwayland - qtmultimedia - qttools + qt6.qtwayland + qt6.qtmultimedia + qt6.qttools ]; - meta = with lib; { + meta = { description = "Professional open-source NLE video editor"; homepage = "https://www.olivevideoeditor.org/"; downloadPage = "https://www.olivevideoeditor.org/download.php"; - license = licenses.gpl3; - maintainers = [ maintainers.balsoft ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ balsoft ]; + platforms = lib.platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "olive-editor"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 045891de15b3..15203c2ead4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3878,8 +3878,6 @@ with pkgs; protobuf = protobuf_21; }; - olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { }; - ome_zarr = with python3Packages; toPythonApplication ome-zarr; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };