From 69b05a57eed16218d607a90d7bc49ba79a2d850e Mon Sep 17 00:00:00 2001 From: Sughosha Date: Wed, 21 Jun 2023 16:30:27 -0600 Subject: nongnu: nvidia-driver: Support "i686-linux" system. * nongnu/packages/nvidia.scm (nvidia-driver): Support "i686-linux" system. Signed-off-by: ison --- nongnu/packages/nvidia.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'nongnu/packages/nvidia.scm') diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index f4241ca..89dc58b 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -224,12 +224,14 @@ NVIDIA Management Library") (ice-9 regex) (ice-9 textual-ports)) #:install-plan - #~`(("." "lib/" #:include-regexp ("^./[^/]+\\.so") #:exclude-regexp ("nvidia_drv\\.so" "libglxserver_nvidia\\.so\\..*")) + #~`((,#$(match (or (%current-target-system) (%current-system)) + ("i686-linux" "32") + ("x86_64-linux" ".")) + "lib/" #:include-regexp ("^./[^/]+\\.so") #:exclude-regexp ("nvidia_drv\\.so" "libglxserver_nvidia\\.so\\..*")) ("." "share/nvidia/" #:include-regexp ("nvidia-application-profiles.*")) ("." "share/egl/egl_external_platform.d/" #:include-regexp (".*_nvidia_.*\\.json")) ("90-nvidia.rules" "lib/udev/rules.d/") ("nvidia-drm-outputclass.conf" "share/x11/xorg.conf.d/") - ("nvidia-smi" "bin/") ("nvidia-dbus.conf" "share/dbus-1/system.d/") ("nvidia-smi.1.gz" "share/man/man1/") ("nvidia.icd" "etc/OpenCL/vendors/") @@ -301,6 +303,11 @@ KERNEL==\"nvidia_uvm\", RUN+=\"@sh@ -c '@mknod@ -m 666 /dev/nvidia-uvm-tools c $ (patch-elf file))) (append (find-files #$output ".*\\.so") (find-files (string-append #$output "/bin"))))))) + (add-before 'patch-elf 'install-nvidia-smi + (lambda _ + (if (string-match "x86_64-linux" + (or #$(%current-target-system) #$(%current-system))) + (install-file "nvidia-smi" (string-append #$output "/bin"))))) (add-after 'patch-elf 'create-short-name-symlinks (lambda _ (define (get-soname file) @@ -335,7 +342,7 @@ KERNEL==\"nvidia_uvm\", RUN+=\"@sh@ -c '@mknod@ -m 666 /dev/nvidia-uvm-tools c $ (string-append #$output "/lib/xorg/modules/extensions/" "libglxserver_nvidia.so")) (symlink (string-append "libnvidia-allocator.so." #$version) (string-append #$output "/lib/nvidia-drm_gbm.so" ))))))) - (supported-systems '("x86_64-linux")) + (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs (list patchelf)) (inputs (list `(,gcc "lib") -- cgit v1.2.3