From f77e6d03e9342aab03a08917c1f3db7cbb136ade Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Mar 2017 15:12:06 -0500
Subject: [PATCH] openshot-qt: correct packaging errors and pin to Qt 5.6

---
 pkgs/applications/video/openshot-qt/default.nix     | 9 +++------
 pkgs/applications/video/openshot-qt/libopenshot.nix | 6 +++---
 pkgs/top-level/all-packages.nix                     | 4 +++-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index ca44742b046..a1d8cb0f01e 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,11 +1,8 @@
 {stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen
-, ffmpeg, python3Packages, qt55}:
+, ffmpeg, python3Packages, libopenshot, qtbase, qtmultimedia }:
 
 with stdenv.lib;
 
-let
-  libopenshot = callPackage ./libopenshot.nix {};
-in
 stdenv.mkDerivation rec {
   name = "openshot-qt-${version}";
   version = "2.1.0";
@@ -20,8 +17,8 @@ stdenv.mkDerivation rec {
   buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];
 
   propagatedBuildInputs = [
-    qt55.qtbase
-    qt55.qtmultimedia
+    qtbase
+    qtmultimedia
     libopenshot
   ];
 
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index b0891a3d69f..de4a0cf1dcd 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
-, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp
+{ stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
+, imagemagick, ffmpeg, qtbase, qtmultimedia, swig, python3, ruby, unittest-cpp
 , cppzmq, czmqpp
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     cmake doxygen
-    imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby
+    imagemagick ffmpeg qtbase qtmultimedia swig python3 ruby
     unittest-cpp cppzmq czmqpp
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9c3c7947dc..598dd204ba1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5335,7 +5335,7 @@ with pkgs;
   jre = jre8;
   jre_headless = jre8_headless;
 
-  openshot-qt = callPackage ../applications/video/openshot-qt { };
+  openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
 
   oraclejdk = pkgs.jdkdistro true false;
 
@@ -9528,6 +9528,8 @@ with pkgs;
 
     libktorrent = callPackage ../development/libraries/libktorrent { };
 
+    libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix {};
+
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
       ffmpeg = ffmpeg_2;
     };