nongnu: nvda: Use nvidia-driver as base.

* nongnu/packages/nvidia.scm (nvda): Use nvidia-driver as base.
[inputs]: Adjusted accordingly.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Hilton Chain 2022-10-04 22:32:17 +08:00 committed by Jonathan Brielmaier
parent fb5a3d0e97
commit 4ce327023f
No known key found for this signature in database
GPG Key ID: ECFC83988B4E4B9F

View File

@ -624,7 +624,7 @@ configuration, creating application profiles, gpu monitoring and more.")
;; required for grafting ;; required for grafting
(define-public nvda (define-public nvda
(package (package
(inherit nvidia-libs) (inherit nvidia-driver)
(name "nvda") (name "nvda")
(source #f) (source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
@ -637,10 +637,10 @@ configuration, creating application profiles, gpu monitoring and more.")
(ice-9 regex)) (ice-9 regex))
(union-build #$output (union-build #$output
(list #$(this-package-input "mesa") (list #$(this-package-input "mesa")
#$(this-package-input "nvidia-libs")) #$(this-package-input "nvidia-driver"))
#:resolve-collision #:resolve-collision
(lambda (files) (lambda (files)
(let ((file (if (string-match "nvidia-libs" (let ((file (if (string-match "nvidia-driver"
(first files)) (first files))
(first files) (first files)
(last files)))) (last files))))
@ -650,7 +650,7 @@ configuration, creating application profiles, gpu monitoring and more.")
"These are the libraries of the evil NVIDIA driver, packaged in such a "These are the libraries of the evil NVIDIA driver, packaged in such a
way that you can use the transformation option @code{--with-graft=mesa=nvda} way that you can use the transformation option @code{--with-graft=mesa=nvda}
to use the NVIDIA driver with a package that requires mesa.") to use the NVIDIA driver with a package that requires mesa.")
(inputs (list mesa nvidia-libs)) (inputs (list mesa nvidia-driver))
(outputs '("out")))) (outputs '("out"))))
(define mesa/fake (define mesa/fake