Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2025-01-18 11:45:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: nvidia-driver: Simplify patch-elf phase.

Browse source 
* nongnu/packages/nvidia.scm (nvidia-driver)[inputs]: Remove libglvnd-for-nvda.
[arguments]<#:phases>: Simplify 'patch-elf.
This commit is contained in:
Hilton Chain 2024-11-30 22:21:46 +08:00
parent 825c68acea
commit 720df79727
No known key found for this signature in database
GPG key ID: ACC66D09CA528292
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
nongnu/packages/nvidia.scm
View file

@ -303,23 +303,26 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
"/share/vulkan/icd.d/nvidia_icd.json" "/share/vulkan/icd.d/nvidia_icd.json"
"/share/vulkan/implicit_layer.d/nvidia_layers.json")))) "/share/vulkan/implicit_layer.d/nvidia_layers.json"))))
(add-after 'install 'patch-elf (add-after 'install 'patch-elf
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(let* ((ld.so (string-append #$(this-package-input "glibc") (let* ((ld.so (search-input-file
#$(glibc-dynamic-linker))) inputs #$(glibc-dynamic-linker)))
(rpath (string-join (rpath (string-join
(list (string-append #$output "/lib") (cons* (dirname ld.so)
(string-append #$openssl-1.1 "/lib") (string-append #$output "/lib")
(string-append #$(this-package-input "egl-wayland") "/lib") (map (lambda (name)
(string-append (ungexp (this-package-input "gcc") "lib") "/lib") (dirname
(string-append #$(this-package-input "glibc") "/lib") (search-input-file
(string-append #$(this-package-input "libdrm") "/lib") inputs
(string-append #$(this-package-input "libglvnd") "/lib") (string-append "lib/" name))))
(string-append #$(this-package-input "libx11") "/lib") '("libX11.so.6"
(string-append #$(this-package-input "libxcb") "/lib") "libXext.so.6"
(string-append #$(this-package-input "libxext") "/lib") "libcrypto.so.1.1"
(string-append #$(this-package-input "mesa") "/lib") "libcrypto.so.3"
(string-append #$(this-package-input "openssl") "/lib") "libdrm.so.2"
(string-append #$(this-package-input "wayland") "/lib")) "libgbm.so.1"
"libgcc_s.so.1"
"libwayland-client.so.0"
"libxcb.so.1")))
":"))) ":")))
(define (patch-elf file) (define (patch-elf file)
(format #t "Patching ~a ..." file) (format #t "Patching ~a ..." file)
@ -419,7 +422,6 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
`(,gcc "lib") `(,gcc "lib")
glibc glibc
libdrm libdrm
libglvnd-for-nvda
libx11 libx11
libxcb libxcb
libxext libxext