nongnu: ffmpeg/nvidia: Use package name "ffmpeg" and hide.

This allows ‘replace-mesa’ to use substitutes.

* nongnu/packages/video.scm (ffmpeg/nvidia, ffmpeg-6/nvidia): Hide and
deprecate package name.

1 files changed, 44 insertions, 43 deletions

diff --git a/nongnu/packages/video.scm b/nongnu/packages/video.scm
index 2b6def8..096adb0 100644
--- a/nongnu/packages/video.scm
+++ b/nongnu/packages/video.scm
@@ -44,54 +44,55 @@
   #:use-module ((nonguix licenses) #:prefix nonguix-license:))
 
 (define-public ffmpeg/nvidia
-  (package
-    (inherit ffmpeg)
-    (name "ffmpeg-nvidia")
-    (inputs
-     (modify-inputs
-         (package-inputs ffmpeg)
-       (prepend nv-codec-headers)))
-    (arguments
-     (substitute-keyword-arguments (package-arguments ffmpeg)
-       ((#: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
-     (string-append
-      (package-description ffmpeg)
-      "  This build of FFmpeg includes the nonfree NVIDIA encoder for
+  (hidden-package
+   (package
+     (inherit ffmpeg)
+     (inputs
+      (modify-inputs
+          (package-inputs ffmpeg)
+        (prepend nv-codec-headers)))
+     (arguments
+      (substitute-keyword-arguments (package-arguments ffmpeg)
+        ((#: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
+      (string-append
+       (package-description ffmpeg)
+       "  This build of FFmpeg includes the nonfree NVIDIA encoder for
 @code{h264_nvenc} and @code{hevc_nvenc} hardware encoding on NVIDIA GPUs."))
-    (properties '((upstream-name . "ffmpeg")))))
+     (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")))))
+  (hidden-package
+   (package
+     (inherit ffmpeg-6)
+     (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-deprecated-package ffmpeg-nvidia ffmpeg/nvidia)
 
 (define-public gmmlib
   (package