Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-25 09:58:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: nvidia-driver: Simplify inputs.

Browse source 
* nongnu/packages/nvidia.scm (nvidia-driver): Simplify inputs.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Petr Hodina 2022-03-07 09:55:40 +01:00 committed by Jonathan Brielmaier
parent 387d13492f
commit 668fda0855
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F
1 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
nongnu/packages/nvidia.scm
View file

@ -205,8 +205,7 @@
(string-append #$cairo "/lib") (string-append #$cairo "/lib")
(string-append #$gdk-pixbuf "/lib") (string-append #$gdk-pixbuf "/lib")
(string-append #$wayland "/lib") (string-append #$wayland "/lib")
; TODO: Replace this assoc-ref (string-append #$gcc:lib "/lib"))
(string-append (assoc-ref inputs "gcc:lib") "/lib"))
":"))) ":")))
(define (patch-elf file) (define (patch-elf file)
(format #t "Patching ~a ...~%" file) (format #t "Patching ~a ...~%" file)
@ -250,29 +249,31 @@
(string-append #$output "/lib/xorg/modules/extensions/" "libglxserver_nvidia.so")))))))) (string-append #$output "/lib/xorg/modules/extensions/" "libglxserver_nvidia.so"))))))))
(supported-systems '("x86_64-linux")) (supported-systems '("x86_64-linux"))
(native-inputs (native-inputs
`(("patchelf" ,patchelf) (list
("perl" ,perl) patchelf
("python" ,python-2) perl
("which" ,which) python-2
("xz" ,xz))) which
xz))
(inputs (inputs
`(("atk" ,atk) (list
("bash-minimal" ,bash-minimal) atk
("cairo" ,cairo) bash-minimal
("coreutils" ,coreutils) cairo
("gcc:lib" ,gcc "lib") coreutils
("gdk-pixbuf" ,gdk-pixbuf) `(,gcc "lib")
("glib" ,glib) gdk-pixbuf
("grep" ,grep) glib
("gtk+" ,gtk+) grep
("gtk2" ,gtk+-2) gtk+
("kmod" ,kmod) gtk+-2
("libc" ,glibc) kmod
("libx11" ,libx11) glibc
("libxext" ,libxext) libx11
("linux" ,linux-lts) libxext
("pango" ,pango) linux-lts
("wayland" ,wayland))) pango
wayland))
(home-page "https://www.nvidia.com") (home-page "https://www.nvidia.com")
(synopsis "Proprietary Nvidia driver") (synopsis "Proprietary Nvidia driver")
(description "This is the evil Nvidia driver. Don't forget to add (description "This is the evil Nvidia driver. Don't forget to add
@ -328,11 +329,11 @@ Further xorg should be configured by adding:
(string-append libc "/lib") (string-append libc "/lib")
(string-append (assoc-ref inputs "atk") "/lib") (string-append (assoc-ref inputs "atk") "/lib")
(string-append (assoc-ref inputs "cairo") "/lib") (string-append (assoc-ref inputs "cairo") "/lib")
(string-append (assoc-ref inputs "gcc:lib") "/lib") (string-append (assoc-ref inputs "gcc") "/lib")
(string-append (assoc-ref inputs "gdk-pixbuf") "/lib") (string-append (assoc-ref inputs "gdk-pixbuf") "/lib")
(string-append (assoc-ref inputs "glib") "/lib") (string-append (assoc-ref inputs "glib") "/lib")
(string-append (assoc-ref inputs "gtk+") "/lib") (string-append (assoc-ref inputs gtk+) "/lib")
(string-append (assoc-ref inputs "gtk2") "/lib") (string-append (assoc-ref inputs gtk2+-) "/lib")
(string-append (assoc-ref inputs "libx11") "/lib") (string-append (assoc-ref inputs "libx11") "/lib")
(string-append (assoc-ref inputs "libxext") "/lib") (string-append (assoc-ref inputs "libxext") "/lib")
(string-append (assoc-ref inputs "pango") "/lib") (string-append (assoc-ref inputs "pango") "/lib")