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

openshot-qt: 2.2.0 -> 2.3.1 (#24868)

Browse Source 
* openshot-qt: 2.2.0 -> 2.3.1

* openshot-qt: use buildPythonApplication

* openshot: get dialogs in gtk environments working
This commit is contained in:
Patrick Callahan 2017-04-16 12:09:22 -07:00 committed by Jörg Thalheim
parent 73a21ae6c9
commit e760c7bd6a
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,39 +1,33 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, doxygen, python3Packages, ffmpeg, libopenshot , doxygen, python3Packages, libopenshot
, qtbase, qtmultimedia, makeQtWrapper }: , makeQtWrapper, wrapGAppsHook, gtk3 }:
with stdenv.lib; python3Packages.buildPythonApplication rec {
stdenv.mkDerivation rec {
name = "openshot-qt-${version}"; name = "openshot-qt-${version}";
version = "2.2.0"; version = "2.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenShot"; owner = "OpenShot";
repo = "openshot-qt"; repo = "openshot-qt";
rev = "v${version}"; rev = "v${version}";
sha256 = "0dg4fkkci1rz49yrdd4fa1whv10c1pgm3cl4i49452ckqa7qg037"; sha256 = "10j3p10q66m9nhzcd8315q1yiqscidkjbm474mllw7c281vacvzw";
}; };
buildInputs = nativeBuildInputs = [ doxygen wrapGAppsHook ];
[ python3Packages.python ffmpeg libopenshot qtbase qtmultimedia ];
nativeBuildInputs = buildInputs = [ gtk3 ];
[ doxygen makeQtWrapper ];
installPhase = '' propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 sip httplib2 pyzmq ];
mkdir -p $(toPythonPath $out)
cp -r src/* $(toPythonPath $out)
mkdir -p $out/bin preConfigure = ''
echo "#/usr/bin/env sh" >$out/bin/openshot-qt # tries to create caching directories during install
echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt export HOME=$(mktemp -d)
chmod +x $out/bin/openshot-qt
wrapQtProgram $out/bin/openshot-qt \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH"
''; '';
doCheck = false; doCheck = false;
meta = { meta = with stdenv.lib; {
homepage = http://openshot.org/; homepage = http://openshot.org/;
description = "Free, open-source video editor"; description = "Free, open-source video editor";
longDescription = '' longDescription = ''

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

@ -8,13 +8,13 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libopenshot-${version}"; name = "libopenshot-${version}";
version = "0.1.3"; version = "0.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenShot"; owner = "OpenShot";
repo = "libopenshot"; repo = "libopenshot";
rev = "v${version}"; rev = "v${version}";
sha256 = "0slszl6w96rhxhi6agw85dc4gmpab2qw03mq32g4qrirz68anz6f"; sha256 = "1mqci103kn4l7w8i9kqzi705kxn4q596vw0sh05r1w5nbyjwcyp6";
}; };
patchPhase = '' patchPhase = ''