From 78987e2af0346fd6d5abf9597102188e5d1cfedf Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Thu, 14 May 2020 08:39:53 +0200 Subject: [PATCH] ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries --- pkgs/development/libraries/ffmpeg/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f56447668ea..500d99765ba 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -199,9 +199,10 @@ stdenv.mkDerivation rec { --replace "includedir=$out" "includedir=''${!outputInclude}" done '' + 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. - addOpenGLRunpath $out/lib/libavcodec.so* + addOpenGLRunpath $out/lib/libavcodec.so + addOpenGLRunpath $out/lib/libavutil.so ''; installFlags = [ "install-man" ];