makemkv: migrate to by-name

2025-02-22 12:57:38 -05:00 · 2025-02-22 12:57:38 -05:00 · cf9c59527b
commit cf9c59527b
parent 03aafcd3d3
3 changed files with 3 additions and 6 deletions
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.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
  ];

--- a/pkgs/applications/video/makemkv/r13y.patch
+++ b/pkgs/applications/video/makemkv/r13y.patch
--- 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 {