openshot-qt: 2.1.0 -> 2.2.0

Also, libopenshot and libopenshot-audio
are now directly referenced on all-packages.nix.

1 files changed, 24 insertions, 21 deletions

diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index de4a0cf1dcd..dd141043169 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
-, imagemagick, ffmpeg, qtbase, qtmultimedia, swig, python3, ruby, unittest-cpp
-, cppzmq, czmqpp
-}:
+{ stdenv, fetchFromGitHub
+, pkgconfig, cmake, doxygen
+, libopenshot-audio, imagemagick, ffmpeg
+, swig, python3, ruby
+, unittest-cpp, cppzmq, czmqpp
+, qtbase, qtmultimedia }:
 
 with stdenv.lib;
-
-let
-  libopenshot_audio = callPackage ./libopenshot-audio.nix {};
-in
 stdenv.mkDerivation rec {
   name = "libopenshot-${version}";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm";
+    sha256 = "0slszl6w96rhxhi6agw85dc4gmpab2qw03mq32g4qrirz68anz6f";
   };
 
   patchPhase = ''
@@ -27,22 +25,27 @@ stdenv.mkDerivation rec {
     export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages
   '';
 
-  buildInputs = [
-    cmake doxygen
-    imagemagick ffmpeg qtbase qtmultimedia swig python3 ruby
-    unittest-cpp cppzmq czmqpp
-  ];
+  nativeBuildInputs = [ pkgconfig cmake doxygen ];
+
+  buildInputs =
+  [ imagemagick ffmpeg swig python3 ruby unittest-cpp
+    cppzmq czmqpp qtbase qtmultimedia ];
 
-  LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}";
+  LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}";
   "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";
 
   doCheck = false;
 
   meta = {
-    homepage = "http://openshot.org/";
-    description = "Free, open-source video editor";
-    license = licenses.gpl3Plus;
-    maintainers = [];
-    platforms = platforms.linux;
+    homepage = http://openshot.org/;
+    description = "Free, open-source video editor library";
+    longDescription = ''
+      OpenShot Library (libopenshot) is an open-source project dedicated to
+      delivering high quality video editing, animation, and playback solutions
+      to the world. API currently supports C++, Python, and Ruby.
+    '';
+    license = with licenses; gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; linux;
   };
 }