Merge pull request #121475 from danieldk/makemkv-ffmpeg
makemkv: switch from ffmpeg_3 to ffmpeg
This commit is contained in:
commit
639730bd11
@ -3,7 +3,7 @@
|
|||||||
, fetchurl
|
, fetchurl
|
||||||
, autoPatchelfHook
|
, autoPatchelfHook
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, ffmpeg_3
|
, ffmpeg
|
||||||
, openssl
|
, openssl
|
||||||
, qtbase
|
, qtbase
|
||||||
, zlib
|
, zlib
|
||||||
@ -39,7 +39,7 @@ in mkDerivation {
|
|||||||
|
|
||||||
nativeBuildInputs = [ autoPatchelfHook pkg-config ];
|
nativeBuildInputs = [ autoPatchelfHook pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ ffmpeg_3 openssl qtbase zlib ];
|
buildInputs = [ ffmpeg openssl qtbase zlib ];
|
||||||
|
|
||||||
qtWrapperArgs =
|
qtWrapperArgs =
|
||||||
let
|
let
|
||||||
|
Loading…
x
Reference in New Issue
Block a user