From 32c687865d79f1895b5821ff538c017f11230376 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 8 Jun 2022 05:58:41 +0200 Subject: nongnu: nvda: Use gexp. * nongnu/packages/nvidia.scm (nvda): Use gexp. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/nvidia.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index f2dfd05..4360d7d 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -512,26 +512,25 @@ configuration, creating application profiles, gpu monitoring and more.") (source #f) (build-system trivial-build-system) (arguments - '(#:modules ((guix build union)) - #:builder (begin + (list #:modules '((guix build union)) + #:builder #~(begin (use-modules (guix build union) (srfi srfi-1) (ice-9 regex)) (union-build (assoc-ref %outputs "out") - (list (assoc-ref %build-inputs "mesa") (assoc-ref %build-inputs "nvidia-libs")) + (list #$mesa #$nvidia-libs) #:resolve-collision (lambda (files) (let ((file (if (string-match "nvidia-libs" (first files)) (first files) (last files)))) (format #t "chosen ~a ~%" file) - file))) - #t))) + file)))))) (description "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} to use the nvidia driver with a package that requires mesa.") (inputs - `(("nvidia-libs" ,nvidia-libs) - ("mesa" ,mesa))) + (list mesa + nvidia-libs)) (outputs '("out")))) (define mesa/fake -- cgit v1.2.3