From 6c9aaf2a811720a4a9ec603116314f39c22cd636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 7 Nov 2020 14:52:03 +0100
Subject: [PATCH 1/2] makemkv: fix formatting and replace pkgconfig alias

---
 pkgs/applications/video/makemkv/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index d3cb12924c26..953f5b56c726 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -1,5 +1,12 @@
-{ stdenv, mkDerivation, fetchurl, autoPatchelfHook
-, ffmpeg_3, openssl, qtbase, zlib, pkgconfig
+{ stdenv
+, mkDerivation
+, fetchurl
+, autoPatchelfHook
+, pkg-config
+, ffmpeg_3
+, openssl
+, qtbase
+, zlib
 }:
 
 let
@@ -27,7 +34,7 @@ in mkDerivation {
 
   sourceRoot = "makemkv-oss-${version}";
 
-  nativeBuildInputs = [ autoPatchelfHook pkgconfig ];
+  nativeBuildInputs = [ autoPatchelfHook pkg-config ];
 
   buildInputs = [ ffmpeg_3 openssl qtbase zlib ];
 

From 83e9cc41f62dbdce06c62c82276f6c5a0afa0097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 7 Nov 2020 14:55:09 +0100
Subject: [PATCH 2/2] makemkv: add jre_headless PATH through the wrapper

MakeMKV requires a Java runtime environment to extract some Blu-ray
disks:

http://www.makemkv.com/bdjava/

This change provides jre_headless by default.
---
 pkgs/applications/video/makemkv/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 953f5b56c726..6575fa0634dc 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -7,6 +7,9 @@
 , openssl
 , qtbase
 , zlib
+
+, withJava ? true
+, jre_headless
 }:
 
 let
@@ -38,6 +41,13 @@ in mkDerivation {
 
   buildInputs = [ ffmpeg_3 openssl qtbase zlib ];
 
+  qtWrapperArgs =
+    let
+      binPath = stdenv.lib.makeBinPath [ jre_headless ];
+    in stdenv.lib.optionals withJava [
+      ''--prefix PATH : ${binPath}''
+    ];
+
   installPhase = ''
     runHook preInstall