Merge pull request #87588 from elohmeier/ffmpeg-addOpenGLRunpath

ffmpeg-full: setup addOpenGLRunpath
This commit is contained in:
Florian Klink 2020-05-16 21:24:12 +02:00 committed by GitHub
commit 1f207888d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
/*
* Licensing options (yes some are listed twice, filters and such are not listed)
*/
@ -416,7 +416,7 @@ stdenv.mkDerivation rec {
"--enable-cross-compile"
];
nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ];
buildInputs = [
bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
@ -444,6 +444,13 @@ stdenv.mkDerivation rec {
cp -a tools/qt-faststart $out/bin/
'';
postFixup = optionalString stdenv.isLinux ''
# Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found.
# See the explanation in addOpenGLRunpath.
addOpenGLRunpath $out/lib/libavcodec.so
addOpenGLRunpath $out/lib/libavutil.so
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {