diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-11-06 13:45:30 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-11-06 13:50:49 -0300 |
commit | abe8a309121a7839f5126d405e5edbf18294e685 (patch) | |
tree | 286be745372f5b9800ad1ee3154ea59abf908ce4 /pkgs/applications/video | |
parent | ecb6c3515fa67049de9e4c2534c151f4538773c2 (diff) |
libopenshot: 0.2.5 -> 0.2.7
Many thanks to @jonringer!
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/openshot-qt/libopenshot.nix | 77 |
1 files changed, 47 insertions, 30 deletions
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 246c3d5cab86e..8a98010ef642b 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,56 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, pkg-config, cmake, doxygen -, libopenshot-audio, imagemagick, ffmpeg -, swig, python3, jsoncpp -, cppzmq, zeromq -, qtbase, qtmultimedia +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, cmake +, cppzmq +, doxygen +, ffmpeg +, imagemagick +, jsoncpp +, libopenshot-audio , llvmPackages +, pkg-config +, python3 +, qtbase +, qtmultimedia +, swig +, zeromq }: -with lib; stdenv.mkDerivation rec { pname = "libopenshot"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp"; + sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U="; }; - patches = [ - # Fix build with GCC 10. - (fetchpatch { - name = "fix-build-with-gcc-10.patch"; - url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff"; - sha256 = "0i7rpdsr8y9dphil8yq75qbh20vfqjc2hp5ahv0ws58z9wj6ngnz"; - }) - ]; - postPatch = '' 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/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' bindings/python/CMakeLists.txt export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ pkg-config cmake doxygen swig ]; + nativeBuildInputs = [ + alsa-lib + cmake + doxygen + pkg-config + swig + ]; - buildInputs = - [ imagemagick ffmpeg python3 jsoncpp - cppzmq zeromq qtbase qtmultimedia ] - ++ optional stdenv.isDarwin llvmPackages.openmp - ; + buildInputs = [ + cppzmq + ffmpeg + imagemagick + jsoncpp + libopenshot-audio + python3 + qtbase + qtmultimedia + zeromq + ] ++ lib.optionals stdenv.isDarwin [ + llvmPackages.openmp + ]; dontWrapQtApps = true; - LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; - doCheck = false; cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; - meta = { + meta = with lib; { homepage = "http://openshot.org/"; description = "Free, open-source video editor library"; longDescription = '' @@ -58,8 +71,12 @@ stdenv.mkDerivation rec { delivering high quality video editing, animation, and playback solutions to the world. API currently supports C++, Python, and Ruby. ''; - license = with licenses; gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + platforms = platforms.unix; + }; + + passthru = { + inherit libopenshot-audio; }; } |