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

Merge pull request #272656 from turion/dev_kdenlive_mlt

Browse Source 
kdenlive: Use ffmpeg-full for mlt
This commit is contained in:
Rick van Schijndel 2023-12-10 19:34:31 +01:00 committed by GitHub
commit ab09ab75a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/kde/kdenlive/default.nix
View File

@ -36,6 +36,11 @@
, wrapGAppsHook , wrapGAppsHook
}: }:
let
mlt-full = mlt.override {
ffmpeg = ffmpeg-full;
};
in
mkDerivation { mkDerivation {
pname = "kdenlive"; pname = "kdenlive";
nativeBuildInputs = [ nativeBuildInputs = [
@ -60,7 +65,7 @@ mkDerivation {
kplotting kplotting
ktextwidgets ktextwidgets
mediainfo mediainfo
mlt mlt-full
phonon-backend-gstreamer phonon-backend-gstreamer
qtdeclarative qtdeclarative
qtmultimedia qtmultimedia
@ -81,8 +86,9 @@ mkDerivation {
# https://github.com/NixOS/nixpkgs/issues/83885 # https://github.com/NixOS/nixpkgs/issues/83885
patches = [ ./dependency-paths.patch ]; patches = [ ./dependency-paths.patch ];
inherit mlt mediainfo; inherit mediainfo;
ffmpeg = ffmpeg-full; ffmpeg = ffmpeg-full;
mlt = mlt-full;
postPatch = postPatch =
# Module Qt5::Concurrent must be included in `find_package` before it is used. # Module Qt5::Concurrent must be included in `find_package` before it is used.