From cf9c59527b042f4502a7b4ea5b484bfbc4e5c6ca Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Sat, 22 Feb 2025 12:57:38 -0500
Subject: [PATCH] makemkv: migrate to by-name

---
 .../makemkv/default.nix => by-name/ma/makemkv/package.nix} | 7 +++----
 pkgs/{applications/video => by-name/ma}/makemkv/r13y.patch | 0
 pkgs/top-level/all-packages.nix                            | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/video/makemkv/default.nix => by-name/ma/makemkv/package.nix} (98%)
 rename pkgs/{applications/video => by-name/ma}/makemkv/r13y.patch (100%)

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 {