diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-03-29 19:57:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 19:57:13 +0100 |
| commit | a8e19088da1aea79322f1bd411d01b288bf28ccd (patch) | |
| tree | 3db6ca15e5f58700fe99b4a5e9fb10b54d76774d /pkgs/applications/video | |
| parent | ebaa3c5bd1ae96d809e1380b74d635aea0b586f8 (diff) | |
| parent | de8f760fbd4d8895047c090516841d259b145719 (diff) | |
| download | nixpkgs-a8e19088da1aea79322f1bd411d01b288bf28ccd.tar nixpkgs-a8e19088da1aea79322f1bd411d01b288bf28ccd.tar.gz nixpkgs-a8e19088da1aea79322f1bd411d01b288bf28ccd.tar.bz2 nixpkgs-a8e19088da1aea79322f1bd411d01b288bf28ccd.tar.lz nixpkgs-a8e19088da1aea79322f1bd411d01b288bf28ccd.tar.xz nixpkgs-a8e19088da1aea79322f1bd411d01b288bf28ccd.tar.zst nixpkgs-a8e19088da1aea79322f1bd411d01b288bf28ccd.zip | |
Merge pull request #54392 from ivan/nv-codec
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 66fc1645e9a..332495adfce 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs, mujs -, lua, libuchardet, libiconv ? null, darwin +, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin , waylandSupport ? stdenv.isLinux , wayland ? null @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs - luaEnv libuchardet mujs + luaEnv libuchardet mujs nv-codec-headers ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray |