public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #103085 from danieldk/makemkv-jre 

makemkv: add jre_headless PATH through the wrapper
This commit is contained in:
Daniël de Kok 2020-11-12 20:17:18 +01:00 committed by GitHub
parent a245f37b20 83e9cc41f6
commit e2db0ee4a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/video/makemkv/default.nix
View File

@ -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