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

Merge pull request #28677 from bkchr/openshot_new_version

Browse Source 
Openshot: 2.3.1 -> 2.3.4
This commit is contained in:
Jörg Thalheim 2017-08-29 11:58:37 +01:00 committed by GitHub
commit ac279998af
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,20 +4,20 @@
python3Packages.buildPythonApplication rec {
name = "openshot-qt-${version}";
version = "2.3.1";
version = "2.3.4";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "openshot-qt";
rev = "v${version}";
sha256 = "10j3p10q66m9nhzcd8315q1yiqscidkjbm474mllw7c281vacvzw";
sha256 = "026zxvg5mij49g021hipv3hspsx8m5bs4v9pm2axqw6rvszjk90z";
};
nativeBuildInputs = [ doxygen wrapGAppsHook ];
buildInputs = [ gtk3 ];
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 sip httplib2 pyzmq ];
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 requests sip httplib2 pyzmq ];
preConfigure = ''

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

@ -4,13 +4,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libopenshot-audio-${version}";
version = "0.1.2";
version = "0.1.4";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot-audio";
rev = "v${version}";
sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6";
sha256 = "07615vacbvi08pzm4lxfckfwib2xcfdjaggpda58hy8nr0677fzq";
};
nativeBuildInputs =

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

@ -1,34 +1,32 @@
{ stdenv, fetchFromGitHub
{ stdenv, fetchFromGitHub, fetchpatch
, pkgconfig, cmake, doxygen
, libopenshot-audio, imagemagick, ffmpeg
, swig, python3, ruby
, swig, python3
, unittest-cpp, cppzmq, czmqpp
, qtbase, qtmultimedia }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libopenshot-${version}";
version = "0.1.4";
version = "0.1.7";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
sha256 = "1mqci103kn4l7w8i9kqzi705kxn4q596vw0sh05r1w5nbyjwcyp6";
sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp";
};
patchPhase = ''
sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt
sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt
sed -i 's/{RUBY_VENDOR_ARCH_DIR}/ENV{RUBY_VENDOR_ARCH_DIR}/g' src/bindings/ruby/CMakeLists.txt
export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)
export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages
'';
nativeBuildInputs = [ pkgconfig cmake doxygen ];
buildInputs =
[ imagemagick ffmpeg swig python3 ruby unittest-cpp
[ imagemagick ffmpeg swig python3 unittest-cpp
cppzmq czmqpp qtbase qtmultimedia ];
LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}";
@ -36,6 +34,8 @@ stdenv.mkDerivation rec {
doCheck = false;
cmakeFlags = [ "-DENABLE_RUBY=OFF" ];
meta = {
homepage = http://openshot.org/;
description = "Free, open-source video editor library";

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

@ -5749,7 +5749,7 @@ with pkgs;
jre = jre8;
jre_headless = jre8_headless;
openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
oraclejdk = pkgs.jdkdistro true false;