diff options
| author | Fabian Möller <fabianm88@gmail.com> | 2021-01-07 15:27:53 +0100 |
|---|---|---|
| committer | Fabian Möller <fabianm88@gmail.com> | 2021-01-07 18:18:17 +0100 |
| commit | 02e8f39c2aa2aab8d683c4908b3872fd9531bea8 (patch) | |
| tree | 094edd06ed665b1336ff863cac1671bf036fa1cc /pkgs/applications/video/openshot-qt | |
| parent | e640da312097d601043a46b6d4bf74988dc24ab6 (diff) | |
libopenshot: fix build with gcc10
Diffstat (limited to 'pkgs/applications/video/openshot-qt')
| -rw-r--r-- | pkgs/applications/video/openshot-qt/libopenshot.nix | 12 |
1 files changed, 10 insertions, 2 deletions
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) |