From 2045b40b1061f24e9a51e1f312c9d9e131b8b43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 12 Aug 2016 12:23:26 +0200 Subject: [PATCH] Trying to fix the latest kdenlive --- pkgs/desktops/kde-5/applications/kdenlive.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/kde-5/applications/kdenlive.nix b/pkgs/desktops/kde-5/applications/kdenlive.nix index cf04fa997b81..00826060b69b 100644 --- a/pkgs/desktops/kde-5/applications/kdenlive.nix +++ b/pkgs/desktops/kde-5/applications/kdenlive.nix @@ -1,4 +1,5 @@ { kdeApp +, kdeWrapper , lib , extra-cmake-modules , kdoctools @@ -27,9 +28,11 @@ , kfilemetadata , ffmpeg , phonon-backend-vlc +, qtquickcontrols }: -kdeApp { +let +unwrapped = kdeApp { name = "kdenlive"; nativeBuildInputs = [ extra-cmake-modules @@ -63,13 +66,16 @@ kdeApp { kfilemetadata plasma-framework phonon-backend-vlc + qtquickcontrols ]; - postInstall = '' - wrapQtProgram "$out/bin/kdenlive" \ - --prefix PATH : "${kinit}/bin" - ''; enableParallelBuilding = true; meta = { license = with lib.licenses; [ gpl2Plus ]; }; +}; +in +kdeWrapper unwrapped +{ + targets = [ "bin/kdenlive" ]; + paths = [ kinit ]; }