mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Merge pull request #68470 from acowley/kdenlive-mlt
kdenlive: Avoid exposing configurable paths to melt
This commit is contained in:
commit
d72b552931
2 changed files with 25 additions and 0 deletions
|
@ -70,10 +70,13 @@ mkDerivation {
|
|||
kpurpose
|
||||
kdeclarative
|
||||
];
|
||||
patches = [ ./mlt-path.patch ];
|
||||
inherit mlt;
|
||||
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
|
||||
'';
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
|
|
22
pkgs/applications/kde/mlt-path.patch
Normal file
22
pkgs/applications/kde/mlt-path.patch
Normal 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">
|
Loading…
Reference in a new issue