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

libsForQt5.libopenshot: tidy up nixpkgs-hammering comments

Browse Source 
* Remove now-unused dependency from arguments
* Move swig to nativeBuildInputs
* Add comment to fetchpatch
This commit is contained in:
Luke Granger-Brown 2021-05-01 12:51:46 +00:00
parent 3af3db2024
commit 2bf2252d6a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, pkg-config, cmake, doxygen , pkg-config, cmake, doxygen
, libopenshot-audio, imagemagick, ffmpeg , libopenshot-audio, imagemagick, ffmpeg
, swig, python3, jsoncpp , swig, python3, jsoncpp
, unittest-cpp, cppzmq, zeromq , cppzmq, zeromq
, qtbase, qtmultimedia , qtbase, qtmultimedia
, llvmPackages , llvmPackages
}: }:
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
}; };
patches = [ patches = [
# Fix build with GCC 10.
(fetchpatch { (fetchpatch {
name = "fix-build-with-gcc-10.patch"; name = "fix-build-with-gcc-10.patch";
url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff"; url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff";
@ -33,10 +34,10 @@ stdenv.mkDerivation rec {
export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)
''; '';
nativeBuildInputs = [ pkg-config cmake doxygen ]; nativeBuildInputs = [ pkg-config cmake doxygen swig ];
buildInputs = buildInputs =
[ imagemagick ffmpeg swig python3 jsoncpp [ imagemagick ffmpeg python3 jsoncpp
cppzmq zeromq qtbase qtmultimedia ] cppzmq zeromq qtbase qtmultimedia ]
++ optional stdenv.isDarwin llvmPackages.openmp ++ optional stdenv.isDarwin llvmPackages.openmp
; ;