diff options
| author | Daniël de Kok <me@danieldk.eu> | 2020-11-12 20:17:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 20:17:18 +0100 |
| commit | e2db0ee4a28cd0ff73655fbb5fed8b6583c8cc91 (patch) | |
| tree | 40c1c276d007254cb194cbe656d51e2a471c121f /pkgs/applications/video | |
| parent | a245f37b204cb3d1056097a87d00b10bc9625e58 (diff) | |
| parent | 83e9cc41f62dbdce06c62c82276f6c5a0afa0097 (diff) | |
Merge pull request #103085 from danieldk/makemkv-jre
makemkv: add jre_headless PATH through the wrapper
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/makemkv/default.nix | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index d3cb12924c26..6575fa0634dc 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchurl, autoPatchelfHook -, ffmpeg_3, openssl, qtbase, zlib, pkgconfig +{ stdenv +, mkDerivation +, fetchurl +, autoPatchelfHook +, pkg-config +, ffmpeg_3 +, openssl +, qtbase +, zlib + +, withJava ? true +, jre_headless }: let @@ -27,10 +37,17 @@ in mkDerivation { sourceRoot = "makemkv-oss-${version}"; - nativeBuildInputs = [ autoPatchelfHook pkgconfig ]; + nativeBuildInputs = [ autoPatchelfHook pkg-config ]; 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 |