From 54d01560e9cfd1c8a5da053df929eaadf6858170 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 15 Dec 2023 22:01:57 +0800 Subject: nongnu: nvidia-settings: Unbundle jansson. * nongnu/packages/nvidia.scm (nvidia-settings) [inputs]: Add jansson. [source]: Delete bundled jansson. [arguments]<#:make-flags>: Don't use bundled jansson. Signed-off-by: John Kehayias --- nongnu/packages/nvidia.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'nongnu') diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 2d07085..fccacef 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -539,6 +539,8 @@ userspace tools from the corresponding driver release.") (url "https://github.com/NVIDIA/nvidia-settings") (commit version))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "src/jansson")) (sha256 (base32 "1hplc42115c06cc555cjmw3c9371qn7ibwjpqjybcf6ixfd6lryq")))) @@ -546,7 +548,8 @@ userspace tools from the corresponding driver release.") (arguments (list #:tests? #f ;no test suite #:make-flags - #~(list (string-append "PREFIX=" #$output) + #~(list "NV_USE_BUNDLED_LIBJANSSON=0" + (string-append "PREFIX=" #$output) (string-append "CC=" #$(cc-for-target))) #:phases #~(modify-phases %standard-phases @@ -564,6 +567,7 @@ userspace tools from the corresponding driver release.") glu gtk+ gtk+-2 + jansson libvdpau libx11 libxext -- cgit v1.2.3