git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108689 from B4dM4n/openshot-qt-unbreak
commit29edcc57f2c28f5423958de08d2c7e7d6c010d82 authorSandro <sandro.jaeckel@gmail.com> dateThu 7 Jan 2021, 20:53 (6 years ago) parent70f5ea8d4e7efc
2 files changed+10−5
pkgs/applications/video/openshot-qt/default.nix−3 pkgs/applications/video/openshot-qt/libopenshot.nix+10−2
pkgs/applications/video/openshot-qt/default.nix−3
@@ -55,8 +55,5 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
5555 license = with licenses; gpl3Plus;
5656 maintainers = with maintainers; [ AndersonTorres ];
5757 platforms = with platforms; unix;
58− # Cannot use a newer Qt (5.15) version because it requires qtwebkit
59− # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
60− broken = true;
6158 };
6259}
pkgs/applications/video/openshot-qt/libopenshot.nix+10−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub
1+{ stdenv, fetchFromGitHub, fetchpatch
22, pkgconfig, cmake, doxygen
33, libopenshot-audio, imagemagick, ffmpeg_3
44, swig, python3
@@ -19,7 +19,15 @@ stdenv.mkDerivation rec {
1919 sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp";
2020 };
2121
22− patchPhase = ''
22+ patches = [
23+ (fetchpatch {
24+ name = "fix-build-with-gcc-10.patch";
25+ url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff";
26+ sha256 = "0i7rpdsr8y9dphil8yq75qbh20vfqjc2hp5ahv0ws58z9wj6ngnz";
27+ })
28+ ];
29+
30+ postPatch = ''
2331 sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt
2432 sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt
2533 export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)