diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-08 02:07:34 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-08 02:07:34 +0100 |
| commit | e6c0c98940bc72280216639cd9fb16745b7e1103 (patch) | |
| tree | 365c0fb567ff279f2475445a8ba001776629df0e /pkgs/applications/video | |
| parent | 5c072a088d7b0efd3a8185953fe21efcd6c1d94a (diff) | |
| parent | 9414948a5a19463acce5a7f2b2206c39ecb6359f (diff) | |
| download | nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.gz nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.bz2 nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.lz nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.xz nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.zst nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.zip | |
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/openshot-qt/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/video/openshot-qt/libopenshot.nix | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 9245bdf03e43..ede47ad061f6 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -55,8 +55,5 @@ mkDerivationWith python3Packages.buildPythonApplication rec { license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; - # Cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - broken = true; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 1b6084a1d2f9..1ab7a5266a23 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp"; }; - patchPhase = '' + patches = [ + (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 export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) |