alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #68470 from acowley/kdenlive-mlt

Browse source 
kdenlive: Avoid exposing configurable paths to melt
This commit is contained in:
Thomas Tuegel 2019-09-15 09:49:18 -05:00 committed by GitHub
parent db9838ef7e 7810dcbd7b
commit d72b552931
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/kde/kdenlive.nix
View file

@ -70,10 +70,13 @@ mkDerivation {
kpurpose kpurpose
kdeclarative kdeclarative
]; ];
patches = [ ./mlt-path.patch ];
inherit mlt;
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.
'' ''
sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
substituteAllInPlace src/kdenlivesettings.kcfg
''; '';
meta = { meta = {
license = with lib.licenses; [ gpl2Plus ]; license = with lib.licenses; [ gpl2Plus ];

22
pkgs/applications/kde/mlt-path.patch Normal file
View file

@ -0,0 +1,22 @@
diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg
--- old/src/kdenlivesettings.kcfg 2019-09-10 23:20:27.555392353 -0400
+++ new/src/kdenlivesettings.kcfg 2019-09-10 23:25:47.533964155 -0400
@@ -378,14 +378,14 @@
</group>
<group name="env">
- <entry name="mltpath" type="Path">
+ <entry name="mltpath" type="Path" hidden="true">
<label>Mlt framework install path.</label>
- <default></default>
+ <default>@mlt@/share/mlt/profiles</default>
</entry>
- <entry name="rendererpath" type="Path">
+ <entry name="rendererpath" type="Path" hidden="true">
<label>Mlt melt renderer install path.</label>
- <default></default>
+ <default>@mlt@/bin/melt</default>
</entry>
<entry name="ffmpegpath" type="Path">