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

Merge pull request #87968 from elohmeier/ffmpeg-addOpenGLRunpath2

Browse Source 
ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries
This commit is contained in:
Florian Klink 2020-05-16 21:51:25 +02:00 committed by GitHub
commit a42e33612a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -198,9 +198,10 @@ stdenv.mkDerivation rec {
--replace "includedir=$out" "includedir=''${!outputInclude}" --replace "includedir=$out" "includedir=''${!outputInclude}"
done done
'' + optionalString stdenv.isLinux '' '' + optionalString stdenv.isLinux ''
# Set RUNPATH so that libnvcuvid in /run/opengl-driver(-32)/lib can be found. # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found.
# See the explanation in addOpenGLRunpath. # See the explanation in addOpenGLRunpath.
addOpenGLRunpath $out/lib/libavcodec.so* addOpenGLRunpath $out/lib/libavcodec.so
addOpenGLRunpath $out/lib/libavutil.so
''; '';
installFlags = [ "install-man" ]; installFlags = [ "install-man" ];