Skip to content

kdenlive: fix package #102364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FRidh merged 3 commits into from
Nov 1, 2020
Merged

kdenlive: fix package #102364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1154a44
kdenlive: avoid double wrapping
FRidh Nov 1, 2020
ed2d393
kdenlive: depend on qtmultimedia instead of unsupported qtwebkit
FRidh Nov 1, 2020
c26dc46
libsForQt515.mlt: is not broken
FRidh Nov 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions pkgs/applications/kde/kdenlive.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
, frei0r
, phonon-backend-gstreamer
, qtdeclarative
, qtmultimedia
, qtquickcontrols2
, qtscript
, qtwebkit
, rttr
, kpurpose
, kdeclarative
Expand Down Expand Up @@ -60,9 +60,9 @@ mkDerivation {
mlt
phonon-backend-gstreamer
qtdeclarative
qtmultimedia
qtquickcontrols2
qtscript
qtwebkit
shared-mime-info
libv4l
ffmpeg-full
Expand All @@ -84,12 +84,20 @@ mkDerivation {
sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
substituteAllInPlace src/kdenlivesettings.kcfg
'';

dontWrapGApps = true;

# 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"
];

preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';

meta = {
license = with lib.licenses; [ gpl2Plus ];
};
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/mlt/qt-5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
broken = versionAtLeast qtbase.version "5.15";
};
}