From 5b3c885b35390cbd5e1d8707fb44604e5f9bf60d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 17 Aug 2016 17:25:03 +0200
Subject: [PATCH 1/2] Shotcut builds, but wants jack1 libs on start.

---
 pkgs/applications/video/shotcut/default.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index fdadc1d99ab..99eb27a4d38 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, SDL, frei0r, gettext, makeWrapper, mlt, pkgconfig, qtbase, qmakeHook }:
+{ stdenv, fetchurl, SDL, frei0r, gettext, makeWrapper, mlt, pkgconfig, qtbase,
+qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qmakeHook }:
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "14.09";
+  version = "16.08";
 
   src = fetchurl {
     url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
-    sha256 = "1504ds3ppqmpg84nb2gb74qndqysjwn3xw7n8xv19kd1pppnr10f";
+    sha256 = "10f32mfj3f8mjp0yi0jb7wc5d3inycn5c1pvqdagjhyyv3rvx9zy";
   };
 
-  buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qtbase qmakeHook ];
+  buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qtbase
+    qtmultimedia qtwebkit qtx11extras qtwebsockets qmakeHook ];
 
   postInstall = ''
     mkdir -p $out/share/shotcut
@@ -35,6 +37,6 @@ stdenv.mkDerivation rec {
 
     # after qt5 bump it probably needs to be updated,
     # but newer versions seem to need newer than the latest stable mlt
-    broken = true;
+    # broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebf327d923d..aa7ea10ccdd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14072,7 +14072,7 @@ in
      stdenv = stdenv_32bit;
   };
 
-  shotcut = qt5.callPackage ../applications/video/shotcut { };
+  shotcut = qt55.callPackage ../applications/video/shotcut { };
 
   smplayer = qt5.callPackage ../applications/video/smplayer { };
 

From e31951cb88c574e5fd043e74f5530329b428a600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 18 Aug 2016 09:40:51 +0200
Subject: [PATCH 2/2] More dependencies to shotcut

---
 pkgs/applications/video/shotcut/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 99eb27a4d38..3bf17435fc0 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, SDL, frei0r, gettext, makeWrapper, mlt, pkgconfig, qtbase,
-qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qmakeHook }:
+{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
+qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquick1, qtquickcontrols,
+qtgraphicaleffects,
+qmakeHook, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
@@ -10,13 +12,15 @@ stdenv.mkDerivation rec {
     sha256 = "10f32mfj3f8mjp0yi0jb7wc5d3inycn5c1pvqdagjhyyv3rvx9zy";
   };
 
-  buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qtbase
-    qtmultimedia qtwebkit qtx11extras qtwebsockets qmakeHook ];
+  buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit
+    qtx11extras qtwebsockets qtquick1 qtquickcontrols qtgraphicaleffects qmakeHook makeQtWrapper ];
+
+  enableParallelBuilding = true;
 
   postInstall = ''
     mkdir -p $out/share/shotcut
     cp -r src/qml $out/share/shotcut/
-    wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
+    wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${jack1}/lib:${SDL.out}/lib
   '';
 
   meta = with stdenv.lib; {