diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-05-01 12:51:46 +0000 |
|---|---|---|
| committer | Luke Granger-Brown <git@lukegb.com> | 2021-05-01 12:51:46 +0000 |
| commit | 2bf2252d6a61f55a1ba5375968b8b3788ede0c93 (patch) | |
| tree | 3d1ed3fb4a446a4dd9d9fadda54dbad6e5d2df64 /pkgs/applications/video/openshot-qt | |
| parent | 3af3db2024a645c1188f5509e66c50cc5bcf7c9e (diff) | |
libsForQt5.libopenshot: tidy up nixpkgs-hammering comments
* Remove now-unused dependency from arguments
* Move swig to nativeBuildInputs
* Add comment to fetchpatch
Diffstat (limited to 'pkgs/applications/video/openshot-qt')
| -rw-r--r-- | pkgs/applications/video/openshot-qt/libopenshot.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index d635d6052cf7..246c3d5cab86 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -2,7 +2,7 @@ , pkg-config, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg , swig, python3, jsoncpp -, unittest-cpp, cppzmq, zeromq +, cppzmq, zeromq , qtbase, qtmultimedia , llvmPackages }: @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix build with GCC 10. (fetchpatch { name = "fix-build-with-gcc-10.patch"; url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff"; @@ -33,10 +34,10 @@ stdenv.mkDerivation rec { export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ pkg-config cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen swig ]; buildInputs = - [ imagemagick ffmpeg swig python3 jsoncpp + [ imagemagick ffmpeg python3 jsoncpp cppzmq zeromq qtbase qtmultimedia ] ++ optional stdenv.isDarwin llvmPackages.openmp ; |