diff options
Diffstat (limited to 'nongnu/packages')
| -rw-r--r-- | nongnu/packages/nvidia.scm | 3 | ||||
| -rw-r--r-- | nongnu/packages/video.scm | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index b02ac87..fb05624 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -839,7 +839,8 @@ variables @code{__GLX_VENDOR_LIBRARY_NAME=nvidia} and (package-input-grafting `((,mesa . ,driver) (,nvidia-driver . ,driver) - (,ffmpeg . ,ffmpeg/nvidia))) + (,ffmpeg . ,ffmpeg/nvidia) + (,ffmpeg-6 . ,ffmpeg-6/nvidia))) obj)) diff --git a/nongnu/packages/video.scm b/nongnu/packages/video.scm index d1a73ee..2b6def8 100644 --- a/nongnu/packages/video.scm +++ b/nongnu/packages/video.scm @@ -69,6 +69,28 @@ @code{h264_nvenc} and @code{hevc_nvenc} hardware encoding on NVIDIA GPUs.")) (properties '((upstream-name . "ffmpeg"))))) +(define-public ffmpeg-6/nvidia + (package + (inherit ffmpeg-6) + (name "ffmpeg-nvidia") + (inputs + (modify-inputs + (package-inputs ffmpeg-6) + (prepend nv-codec-headers))) + (arguments + (substitute-keyword-arguments (package-arguments ffmpeg-6) + ((#:configure-flags flags) + ;; Currently only interested in NVENC. + ;; Might be better to make a ffmpeg-nonfree with all nonfree codecs + ;; in the future. + #~(cons* "--enable-cuvid" + "--enable-ffnvcodec" + "--enable-encoder=hevc_nvenc" + "--enable-encoder=h264_nvenc" + #$flags)))) + (description (package-description ffmpeg/nvidia)) + (properties '((upstream-name . "ffmpeg"))))) + (define-deprecated-package ffmpeg-nvenc ffmpeg/nvidia) (define-public gmmlib |