diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/by-name/ma/makemkv/package.nix similarity index 98% rename from pkgs/applications/video/makemkv/default.nix rename to pkgs/by-name/ma/makemkv/package.nix index f8fbb83d35c4..5832860a7303 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/by-name/ma/makemkv/package.nix @@ -5,10 +5,9 @@ fetchurl, ffmpeg, lib, - mkDerivation, + libsForQt5, openssl, pkg-config, - qtbase, rubyPackages, writeShellApplication, zlib, @@ -35,7 +34,7 @@ let hash = "sha256-JrEV5rpJNRgbXqiKLNUZZtWbZyR44EMTd1kSKVGLZ6o="; }; in -mkDerivation { +libsForQt5.mkDerivation { pname = "makemkv"; inherit version; @@ -58,7 +57,7 @@ mkDerivation { buildInputs = [ ffmpeg openssl - qtbase + libsForQt5.qtbase zlib ]; diff --git a/pkgs/applications/video/makemkv/r13y.patch b/pkgs/by-name/ma/makemkv/r13y.patch similarity index 100% rename from pkgs/applications/video/makemkv/r13y.patch rename to pkgs/by-name/ma/makemkv/r13y.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47439af7c11e..1b35f09b4e76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4162,8 +4162,6 @@ with pkgs; matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { }; - makemkv = libsForQt5.callPackage ../applications/video/makemkv { }; - man = man-db; mangohud = callPackage ../tools/graphics/mangohud {