diff options
| author | Florian Klink <flokli@flokli.de> | 2020-05-16 21:51:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 21:51:25 +0200 |
| commit | a42e33612ab4c2b6d9dcdce78c72771b598bdfbf (patch) | |
| tree | 4872d969a0c6850745f7264941bb8b6b74a7a05e /pkgs/development/libraries/ffmpeg | |
| parent | 75c55c4fe2a3defd87cfee7e6f997e6445207cb9 (diff) | |
| parent | 78987e2af0346fd6d5abf9597102188e5d1cfedf (diff) | |
Merge pull request #87968 from elohmeier/ffmpeg-addOpenGLRunpath2
ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 881166ef9b95..fecffe889f17 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -198,9 +198,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" ]; |