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 <john.kehayias@protonmail.com>
This commit is contained in:
parent
47941b0a84
commit
5f7dabe418
|
@ -66,9 +66,6 @@
|
||||||
|
|
||||||
(define-public nvidia-version "515.76")
|
(define-public nvidia-version "515.76")
|
||||||
|
|
||||||
(define computed-origin-method
|
|
||||||
(@@ (guix packages) computed-origin-method))
|
|
||||||
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
;;; NVIDIA driver checkouts
|
;;; NVIDIA driver checkouts
|
||||||
|
@ -78,7 +75,7 @@
|
||||||
;; Extract the driver installer and make it a new origin instance for reusing.
|
;; Extract the driver installer and make it a new origin instance for reusing.
|
||||||
(define (make-nvidia-source version installer)
|
(define (make-nvidia-source version installer)
|
||||||
(origin
|
(origin
|
||||||
(method computed-origin-method)
|
(method (@@ (guix packages) computed-origin-method))
|
||||||
(file-name (string-append "nvidia-driver-" version "-checkout"))
|
(file-name (string-append "nvidia-driver-" version "-checkout"))
|
||||||
(sha256 #f)
|
(sha256 #f)
|
||||||
(uri
|
(uri
|
||||||
|
@ -89,13 +86,13 @@
|
||||||
(ice-9 ftw))
|
(ice-9 ftw))
|
||||||
(set-path-environment-variable
|
(set-path-environment-variable
|
||||||
"PATH" '("bin")
|
"PATH" '("bin")
|
||||||
(list (canonicalize-path #+bash-minimal)
|
'#+(list bash-minimal
|
||||||
(canonicalize-path #+coreutils)
|
coreutils
|
||||||
(canonicalize-path #+gawk)
|
gawk
|
||||||
(canonicalize-path #+grep)
|
grep
|
||||||
(canonicalize-path #+tar)
|
tar
|
||||||
(canonicalize-path #+which)
|
which
|
||||||
(canonicalize-path #+xz)))
|
xz))
|
||||||
(setenv "XZ_OPT" (string-join (%xz-parallel-args)))
|
(setenv "XZ_OPT" (string-join (%xz-parallel-args)))
|
||||||
(invoke "sh" #$installer "-x")
|
(invoke "sh" #$installer "-x")
|
||||||
(copy-recursively
|
(copy-recursively
|
||||||
|
|
Loading…
Reference in New Issue
Block a user