From 5f7dabe418c705402db3b70389b2d9fa886e89d2 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 15 Dec 2023 22:26:50 +0800 Subject: nongnu: make-nvidia-source: Adjust style. * nongnu/packages/nvidia.scm (computed-origin-method): Delete from top-level. (make-nvidia-source): Use ungexp-native only once. Signed-off-by: John Kehayias --- nongnu/packages/nvidia.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'nongnu') diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index d1aaffd..0153e0d 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -66,9 +66,6 @@ (define-public nvidia-version "515.76") -(define computed-origin-method - (@@ (guix packages) computed-origin-method)) - ;;; ;;; NVIDIA driver checkouts @@ -78,7 +75,7 @@ ;; Extract the driver installer and make it a new origin instance for reusing. (define (make-nvidia-source version installer) (origin - (method computed-origin-method) + (method (@@ (guix packages) computed-origin-method)) (file-name (string-append "nvidia-driver-" version "-checkout")) (sha256 #f) (uri @@ -89,13 +86,13 @@ (ice-9 ftw)) (set-path-environment-variable "PATH" '("bin") - (list (canonicalize-path #+bash-minimal) - (canonicalize-path #+coreutils) - (canonicalize-path #+gawk) - (canonicalize-path #+grep) - (canonicalize-path #+tar) - (canonicalize-path #+which) - (canonicalize-path #+xz))) + '#+(list bash-minimal + coreutils + gawk + grep + tar + which + xz)) (setenv "XZ_OPT" (string-join (%xz-parallel-args))) (invoke "sh" #$installer "-x") (copy-recursively -- cgit v1.2.3