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

Merge pull request #54392 from ivan/nv-codec

Browse Source 
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
This commit is contained in:
Silvan Mosberger 2019-03-29 19:57:13 +01:00 committed by GitHub
commit a8e19088da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/mpv/default.nix
View File

@ -1,7 +1,7 @@
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4 , docutils, perl, pkgconfig, python3, which, ffmpeg_4
, freefont_ttf, freetype, libass, libpthreadstubs, mujs , freefont_ttf, freetype, libass, libpthreadstubs, mujs
, lua, libuchardet, libiconv ? null, darwin , nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
, waylandSupport ? stdenv.isLinux , waylandSupport ? stdenv.isLinux
, wayland ? null , wayland ? null
@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ffmpeg_4 freetype libass libpthreadstubs ffmpeg_4 freetype libass libpthreadstubs
luaEnv libuchardet mujs luaEnv libuchardet mujs nv-codec-headers
] ++ optional alsaSupport alsaLib ] ++ optional alsaSupport alsaLib
++ optional archiveSupport libarchive ++ optional archiveSupport libarchive
++ optional bluraySupport libbluray ++ optional bluraySupport libbluray

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus, speex , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers
, openglSupport ? false, libGLU_combined ? null , openglSupport ? false, libGLU_combined ? null
# Build options # Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
] ++ optional openglSupport libGLU_combined ] ++ optional openglSupport libGLU_combined
++ optional vpxSupport libvpx ++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM