nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120600 from dotlambda/openshot-ffmpeg

Browse Source 
libsForQt5.libopenshot: use ffmpeg instead of ffmpeg_3
This commit is contained in:
Luke Granger-Brown 2021-05-01 18:18:45 +01:00 committed by GitHub
commit b6c96f42ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch { lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config, cmake, doxygen , pkg-config, cmake, doxygen
, libopenshot-audio, imagemagick, ffmpeg_3 , libopenshot-audio, imagemagick, ffmpeg
, swig, python3 , 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_3 swig python3 unittest-cpp [ imagemagick ffmpeg python3 jsoncpp
cppzmq zeromq qtbase qtmultimedia ] cppzmq zeromq qtbase qtmultimedia ]
++ optional stdenv.isDarwin llvmPackages.openmp ++ optional stdenv.isDarwin llvmPackages.openmp
; ;
@ -44,7 +45,6 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true; dontWrapQtApps = true;
LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;
"UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";
doCheck = false; doCheck = false;