diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-21 12:01:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-21 12:01:20 +0000 |
commit | c68c4b3db87877e2ae520ffea2583ae35a0cb04d (patch) | |
tree | 973c14b0253c5f5c65d73cda192e3a06e90a9279 /pkgs/applications/video | |
parent | 6ad93ecdbb115566d66b7a04b914e7ac3d780cd9 (diff) | |
parent | 28e1b1a50a22fd6f155a10fb8e0d50b126774890 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/makemkv/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 1222749303671..26d80b1596c2c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -3,6 +3,7 @@ , fetchurl , autoPatchelfHook , pkg-config +, curl , ffmpeg , openssl , qtbase @@ -42,6 +43,8 @@ in mkDerivation { buildInputs = [ ffmpeg openssl qtbase zlib ]; + runtimeDependencies = [ (lib.getLib curl) ]; + qtWrapperArgs = let binPath = lib.makeBinPath [ jre_headless ]; |