diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index f67ab412c26..86b8dab7f1f 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -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 = '' diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 82c7f247189..6591af9d0d8 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -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 = diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index b45460c426c..02a19c935e7 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b077d5238ce..73533e248f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;