infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nongnu: nvidia-driver: Unbundle EGL external platform libraries.

Browse Source 
* nongnu/packages/nvidia.scm (nvidia-source-unbundle-libraries): Remove egl-gbm
and egl-wayland libraries.
(nvidia-driver)[inputs]: Add egl-gbm, egl-wayland.
Remove mesa.
[arguments]<#:phases>: Use them for configuration.
Adjust RUNPATH accordingly.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
This commit is contained in:
Hilton Chain 2024-01-29 17:12:53 +08:00 committed by John Kehayias
parent 5b0465cf31
commit c05b4995ab
No known key found for this signature in database
GPG Key ID: 499097AE5EA815D9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nongnu/packages/nvidia.scm
View File

@ -77,7 +77,11 @@
(use-modules (guix build utils)) (use-modules (guix build utils))
(for-each delete-file (for-each delete-file
(find-files "." (string-join (find-files "." (string-join
'(;; nvidia-settings '(;; egl-gbm
"libnvidia-egl-gbm\\.so\\."
;; egl-wayland
"libnvidia-egl-wayland\\.so\\."
;; nvidia-settings
"libnvidia-gtk[23]\\.so\\." "libnvidia-gtk[23]\\.so\\."
;; opencl-icd-loader ;; opencl-icd-loader
"libOpenCL\\.so\\.") "libOpenCL\\.so\\.")
@ -172,7 +176,7 @@ VERSION as argument and returns a G-expression."
(substitute* '("10_nvidia_wayland.json" (substitute* '("10_nvidia_wayland.json"
"15_nvidia_gbm.json") "15_nvidia_gbm.json")
(("libnvidia-egl-(wayland|gbm)\\.so\\.." all) (("libnvidia-egl-(wayland|gbm)\\.so\\.." all)
(string-append #$output "/lib/" all))) (search-input-file inputs (string-append "lib/" all))))
;; OpenCL vendor ICD configuration ;; OpenCL vendor ICD configuration
(substitute* "nvidia.icd" (substitute* "nvidia.icd"
@ -205,12 +209,12 @@ KERNEL==\"nvidia_uvm\", RUN+=\"@sh@ -c '@mknod@ -m 666 /dev/nvidia-uvm-tools c $
#$(glibc-dynamic-linker))) #$(glibc-dynamic-linker)))
(rpath (string-join (rpath (string-join
(list (string-append #$output "/lib") (list (string-append #$output "/lib")
(string-append #$(this-package-input "egl-wayland") "/lib")
(string-append (ungexp (this-package-input "gcc") "lib") "/lib") (string-append (ungexp (this-package-input "gcc") "lib") "/lib")
(string-append #$(this-package-input "glibc") "/lib") (string-append #$(this-package-input "glibc") "/lib")
(string-append #$(this-package-input "libdrm") "/lib") (string-append #$(this-package-input "libdrm") "/lib")
(string-append #$(this-package-input "libx11") "/lib") (string-append #$(this-package-input "libx11") "/lib")
(string-append #$(this-package-input "libxext") "/lib") (string-append #$(this-package-input "libxext") "/lib")
(string-append #$(this-package-input "mesa") "/lib")
(string-append #$(this-package-input "wayland") "/lib")) (string-append #$(this-package-input "wayland") "/lib"))
":"))) ":")))
(define (patch-elf file) (define (patch-elf file)
@ -290,7 +294,9 @@ KERNEL==\"nvidia_uvm\", RUN+=\"@sh@ -c '@mknod@ -m 666 /dev/nvidia-uvm-tools c $
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs (list patchelf)) (native-inputs (list patchelf))
(inputs (inputs
(list `(,gcc "lib") (list egl-gbm
egl-wayland
`(,gcc "lib")
bash-minimal bash-minimal
coreutils coreutils
glibc glibc
@ -298,7 +304,6 @@ KERNEL==\"nvidia_uvm\", RUN+=\"@sh@ -c '@mknod@ -m 666 /dev/nvidia-uvm-tools c $
libdrm libdrm
libx11 libx11
libxext libxext
mesa
wayland)) wayland))
(home-page "https://www.nvidia.com") (home-page "https://www.nvidia.com")
(synopsis "Proprietary NVIDIA driver") (synopsis "Proprietary NVIDIA driver")