diff options
| author | Hilton Chain <hako@ultrarare.space> | 2023-12-15 20:59:52 +0800 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-04-24 20:06:16 -0400 |
| commit | 99e12e9cbe37ad44dbaaae21d434a09e692ee3c0 (patch) | |
| tree | 554529a7f9dc2ddfaaee577023873ca862775fda /nongnu | |
| parent | 4bc11de5dd5a4885c0368cb556f93bf09822dcaa (diff) | |
nongnu: nvidia-driver: Remove libraries provided by nvidia-settings.
* nongnu/packages/nvidia.scm (nvidia-source-unbundle-libraries): Remove
libraries provided by nvidia-settings.
(nvidia-driver)[arguments]<#:phases>: Remove their dependencies from RUNPATH.
[inputs]: Remove atk, cairo, gdk-pixbuf, glib, gtk+, gtk+-2, pango.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Diffstat (limited to 'nongnu')
| -rw-r--r-- | nongnu/packages/nvidia.scm | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 1ab3e27..28cea8e 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -73,7 +73,13 @@ (define (nvidia-source-unbundle-libraries version) - #t) + #~(begin + (use-modules (guix build utils)) + (for-each delete-file + (find-files "." (string-join + '(;; nvidia-settings + "libnvidia-gtk[23]\\.so\\.") + "|"))))) (define* (make-nvidia-source version hash @@ -197,18 +203,11 @@ KERNEL==\"nvidia_uvm\", RUN+=\"@sh@ -c '@mknod@ -m 666 /dev/nvidia-uvm-tools c $ (list "$ORIGIN" (string-append #$output "/lib") (string-append #$gcc:lib "/lib") - (string-append #$gtk+-2 "/lib") - (string-append #$(this-package-input "atk") "/lib") - (string-append #$(this-package-input "cairo") "/lib") - (string-append #$(this-package-input "gdk-pixbuf") "/lib") - (string-append #$(this-package-input "glib") "/lib") (string-append #$(this-package-input "glibc") "/lib") - (string-append #$(this-package-input "gtk+") "/lib") (string-append #$(this-package-input "libdrm") "/lib") (string-append #$(this-package-input "libx11") "/lib") (string-append #$(this-package-input "libxext") "/lib") (string-append #$(this-package-input "mesa") "/lib") - (string-append #$(this-package-input "pango") "/lib") (string-append #$(this-package-input "wayland") "/lib")) ":"))) (define (patch-elf file) @@ -265,23 +264,16 @@ KERNEL==\"nvidia_uvm\", RUN+=\"@sh@ -c '@mknod@ -m 666 /dev/nvidia-uvm-tools c $ (native-inputs (list patchelf)) (inputs (list `(,gcc "lib") - atk bash-minimal - cairo coreutils - gdk-pixbuf - glib glibc grep - gtk+ - gtk+-2 kmod libdrm libx11 libxext linux-lts mesa - pango wayland)) (home-page "https://www.nvidia.com") (synopsis "Proprietary NVIDIA driver") |