Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 63f8e22dd8ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5853515f6c15
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 1, 2020

  1. kdenlive: set run-time dep paths (fix #83885)

    @jluttine
    jluttine committed Apr 1, 2020
    Copy the full SHA
    0f93c20 View commit details

  2. Merge pull request #83932 from jluttine/kdenlive-fix-dep-paths 

    kdenlive: set run-time dep paths (fix #83885)
    @Mic92
    Mic92 authored Apr 1, 2020
    Copy the full SHA
    5853515 View commit details
Showing with 36 additions and 1 deletion.
  1. +25 −0 pkgs/applications/kde/ffmpeg-path.patch
  2. +11 −1 pkgs/applications/kde/kdenlive.nix
25 changes: 25 additions & 0 deletions pkgs/applications/kde/ffmpeg-path.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 5edad5ae7..d35347a40 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -403,17 +403,17 @@

<entry name="ffmpegpath" type="Path">
<label>FFmpeg / Libav binary path.</label>
- <default></default>
+ <default>@ffmpeg@/bin/ffmpeg</default>
</entry>

<entry name="ffplaypath" type="Path">
<label>FFplay / avplay binary path.</label>
- <default></default>
+ <default>@ffmpeg@/bin/ffplay</default>
</entry>

<entry name="ffprobepath" type="Path">
<label>FFprobe / avprobe binary path.</label>
- <default></default>
+ <default>@ffmpeg@/bin/ffprobe</default>
</entry>

<entry name="mltthreads" type="Int">
12 changes: 11 additions & 1 deletion pkgs/applications/kde/kdenlive.nix
View file
Original file line number Diff line number Diff line change
@@ -70,14 +70,24 @@ mkDerivation {
kpurpose
kdeclarative
];
patches = [ ./mlt-path.patch ];
# Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
# doesn't find them. See:
# https://github.com/NixOS/nixpkgs/issues/83885
patches = [ ./mlt-path.patch ./ffmpeg-path.patch ];
inherit mlt;
ffmpeg = ffmpeg-full;
postPatch =
# Module Qt5::Concurrent must be included in `find_package` before it is used.
''
sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
substituteAllInPlace src/kdenlivesettings.kcfg
'';
# Frei0r path needs to be set too or Kdenlive will complain. See:
# https://github.com/NixOS/nixpkgs/issues/83885
# https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325
qtWrapperArgs = [
"--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
];
meta = {
license = with lib.licenses; [ gpl2Plus ];
};