public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108689 from B4dM4n/openshot-qt-unbreak

Browse Source
This commit is contained in:
Sandro 2021-01-07 20:53:31 +01:00 committed by GitHub
commit 29edcc57f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/video/openshot-qt/default.nix
View File

@ -55,8 +55,5 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
license = with licenses; gpl3Plus; license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix; 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;
}; };
} }

12
pkgs/applications/video/openshot-qt/libopenshot.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub, fetchpatch
, pkgconfig, cmake, doxygen , pkgconfig, cmake, doxygen
, libopenshot-audio, imagemagick, ffmpeg_3 , libopenshot-audio, imagemagick, ffmpeg_3
, swig, python3 , swig, python3
@ -19,7 +19,15 @@ stdenv.mkDerivation rec {
sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp"; 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/{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' src/bindings/python/CMakeLists.txt
export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)