diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix index 795ba87ad5b5..b2abee579396 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix @@ -25,9 +25,9 @@ , frei0r , phonon-backend-gstreamer , qtdeclarative +, qtmultimedia , qtquickcontrols2 , qtscript -, qtwebkit , rttr , kpurpose , kdeclarative @@ -60,9 +60,9 @@ mkDerivation { mlt phonon-backend-gstreamer qtdeclarative + qtmultimedia qtquickcontrols2 qtscript - qtwebkit shared-mime-info libv4l ffmpeg-full @@ -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 ]; }; |