JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openshot-qt: correct packaging errors and pin to Qt 5.6

Browse Source
This commit is contained in:
Thomas Tuegel 2017-03-24 15:12:06 -05:00
parent f87d3d6f80
commit f77e6d03e9
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/video/openshot-qt/default.nix
View File

@ -1,11 +1,8 @@
{stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen {stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen
, ffmpeg, python3Packages, qt55}: , ffmpeg, python3Packages, libopenshot, qtbase, qtmultimedia }:
with stdenv.lib; with stdenv.lib;
let
libopenshot = callPackage ./libopenshot.nix {};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openshot-qt-${version}"; name = "openshot-qt-${version}";
version = "2.1.0"; version = "2.1.0";
@ -20,8 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg]; buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];
propagatedBuildInputs = [ propagatedBuildInputs = [
qt55.qtbase qtbase
qt55.qtmultimedia qtmultimedia
libopenshot libopenshot
]; ];

6
pkgs/applications/video/openshot-qt/libopenshot.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen { stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp , imagemagick, ffmpeg, qtbase, qtmultimedia, swig, python3, ruby, unittest-cpp
, cppzmq, czmqpp , cppzmq, czmqpp
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cmake doxygen cmake doxygen
imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby imagemagick ffmpeg qtbase qtmultimedia swig python3 ruby
unittest-cpp cppzmq czmqpp unittest-cpp cppzmq czmqpp
]; ];

4
pkgs/top-level/all-packages.nix
View File

@ -5335,7 +5335,7 @@ with pkgs;
jre = jre8; jre = jre8;
jre_headless = jre8_headless; jre_headless = jre8_headless;
openshot-qt = callPackage ../applications/video/openshot-qt { }; openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
oraclejdk = pkgs.jdkdistro true false; oraclejdk = pkgs.jdkdistro true false;
@ -9528,6 +9528,8 @@ with pkgs;
libktorrent = callPackage ../development/libraries/libktorrent { }; libktorrent = callPackage ../development/libraries/libktorrent { };
libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix {};
mlt = callPackage ../development/libraries/mlt/qt-5.nix { mlt = callPackage ../development/libraries/mlt/qt-5.nix {
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };