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

nongnu: nvidia-driver: Remove libraries provided by libglvnd.

Browse Source 
* nongnu/packages/nvidia.scm (nvidia-source-unbundle-libraries): Remove
libraries provided by libglvnd.
(nvidia-driver)[inputs]: Add libglvnd-for-nvda.
[arguments]<#:phases>: Add it to RUNPATH.
(nvda)[arguments]<#:builder>: Add "libglvnd" from inputs to union build.

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

13
nongnu/packages/nvidia.scm
View File

@ -81,6 +81,14 @@
"libnvidia-egl-gbm\\.so\\." "libnvidia-egl-gbm\\.so\\."
;; egl-wayland ;; egl-wayland
"libnvidia-egl-wayland\\.so\\." "libnvidia-egl-wayland\\.so\\."
;; libglvnd
"libEGL\\.so\\."
"libGL\\.so\\."
"libGLESv1_CM\\.so\\."
"libGLESv2\\.so\\."
"libGLX\\.so\\."
"libGLdispatch\\.so\\."
"libOpenGL\\.so\\."
;; nvidia-settings ;; nvidia-settings
"libnvidia-gtk[23]\\.so\\." "libnvidia-gtk[23]\\.so\\."
;; opencl-icd-loader ;; opencl-icd-loader
@ -319,6 +327,7 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
(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 "libglvnd") "/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 "wayland") "/lib")) (string-append #$(this-package-input "wayland") "/lib"))
@ -419,6 +428,7 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
`(,gcc "lib") `(,gcc "lib")
glibc glibc
libdrm libdrm
libglvnd-for-nvda
libx11 libx11
libxext libxext
wayland)) wayland))
@ -673,7 +683,8 @@ configuration, creating application profiles, gpu monitoring and more.")
(use-modules (guix build union)) (use-modules (guix build union))
(union-build (union-build
#$output #$output
'#$(list (this-package-input "mesa") '#$(list (this-package-input "libglvnd")
(this-package-input "mesa")
(this-package-input "nvidia-driver")))))) (this-package-input "nvidia-driver"))))))
(native-search-paths (native-search-paths
(list (list