diff options
| author | Enno Lohmeier <enno@nerdworks.de> | 2020-05-14 08:39:53 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-05-16 21:48:59 +0200 |
| commit | 78987e2af0346fd6d5abf9597102188e5d1cfedf (patch) | |
| tree | a634f926780e3c6acb666c8411e7e2c885e22a7a /pkgs/development/libraries/ffmpeg | |
| parent | b87096c7fbe75d6e43e8e5110347afe962c69963 (diff) | |
| download | nixpkgs-78987e2af0346fd6d5abf9597102188e5d1cfedf.tar nixpkgs-78987e2af0346fd6d5abf9597102188e5d1cfedf.tar.gz nixpkgs-78987e2af0346fd6d5abf9597102188e5d1cfedf.tar.bz2 nixpkgs-78987e2af0346fd6d5abf9597102188e5d1cfedf.tar.lz nixpkgs-78987e2af0346fd6d5abf9597102188e5d1cfedf.tar.xz nixpkgs-78987e2af0346fd6d5abf9597102188e5d1cfedf.tar.zst nixpkgs-78987e2af0346fd6d5abf9597102188e5d1cfedf.zip | |
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 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" ]; |