Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2025-03-19 00:05:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: nvidia-driver: Fix indentation.

Browse source 
* nongnu/packages/nvidia.scm (nvidia-driver): Fix indentation.
[inputs,native-inputs]: Sort alphabetically.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Hilton Chain 2022-11-20 21:15:40 +08:00 • committed by Jonathan Brielmaier
parent 370749ab7b
commit 1544351697
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F
1 changed files with 186 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
nongnu/packages/nvidia.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Alexey Abramov <levenson@mmer.org> ;;; Copyright © 2022 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
;;; ;;;
;;; This file is not part of GNU Guix. ;;; This file is not part of GNU Guix.
;;; ;;;
@ -125,8 +126,7 @@
(string-contains name ".so")))) (string-contains name ".so"))))
(install-file "nvidia_drv.so" (string-append #$output "/lib/xorg/modules/drivers/")) (install-file "nvidia_drv.so" (string-append #$output "/lib/xorg/modules/drivers/"))
(install-file (string-append "libglxserver_nvidia.so." (install-file (string-append "libglxserver_nvidia.so." #$(package-version nvidia-driver))
#$(package-version nvidia-driver))
(string-append #$output "/lib/xorg/modules/extensions/")) (string-append #$output "/lib/xorg/modules/extensions/"))
;; ICD Loader for OpenCL ;; ICD Loader for OpenCL
@ -197,18 +197,18 @@
(rpath (string-join (rpath (string-join
(list "$ORIGIN" (list "$ORIGIN"
(string-append #$output "/lib") (string-append #$output "/lib")
(string-append #$gcc:lib "/lib")
(string-append #$gtk+-2 "/lib")
(string-append #$atk "/lib")
(string-append #$cairo "/lib")
(string-append #$gdk-pixbuf "/lib")
(string-append #$glib "/lib")
(string-append #$glibc "/lib") (string-append #$glibc "/lib")
(string-append #$gtk+ "/lib")
(string-append #$libx11 "/lib") (string-append #$libx11 "/lib")
(string-append #$libxext "/lib") (string-append #$libxext "/lib")
(string-append #$pango "/lib") (string-append #$pango "/lib")
(string-append #$gtk+ "/lib") (string-append #$wayland "/lib"))
(string-append #$gtk+-2 "/lib")
(string-append #$atk "/lib")
(string-append #$glib "/lib")
(string-append #$cairo "/lib")
(string-append #$gdk-pixbuf "/lib")
(string-append #$wayland "/lib")
(string-append #$gcc:lib "/lib"))
":"))) ":")))
(define (patch-elf file) (define (patch-elf file)
(format #t "Patching ~a ...~%" file) (format #t "Patching ~a ...~%" file)
@ -247,45 +247,39 @@
(format #t "Linking ~a to ~a ...~%" mid file) (format #t "Linking ~a to ~a ...~%" mid file)
(symlink (basename file) mid-file)))) (symlink (basename file) mid-file))))
(find-files libdir "\\.so\\.")) (find-files libdir "\\.so\\."))
(symlink (string-append "libglxserver_nvidia.so." (symlink (string-append "libglxserver_nvidia.so." #$(package-version nvidia-driver))
#$(package-version nvidia-driver))
(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 (list patchelf perl python-2 which xz))
(list
patchelf
perl
python-2
which
xz))
(inputs (inputs
(list (list `(,gcc "lib")
atk atk
bash-minimal bash-minimal
cairo cairo
coreutils coreutils
`(,gcc "lib")
gdk-pixbuf gdk-pixbuf
glib glib
glibc
grep grep
gtk+ gtk+
gtk+-2 gtk+-2
kmod kmod
glibc
libx11 libx11
libxext libxext
linux-lts linux-lts
pango pango
wayland)) 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
nvidia-driver to the udev-rules in your config.scm: @code{nvidia-driver} to the @code{udev-rules} in your @file{config.scm}:
@code{(simple-service 'custom-udev-rules udev-service-type (list nvidia-driver))} @code{(simple-service 'custom-udev-rules udev-service-type (list
Further xorg should be configured by adding: nvidia-driver))}. Further xorg should be configured by adding: @code{(modules
@code{(modules (cons* nvidia-driver %default-xorg-modules)) (cons* nvidia-driver %default-xorg-modules)) (drivers '(\"nvidia\"))} to
(drivers '(\"nvidia\"))} to @code{xorg-configuration}.") @code{xorg-configuration}.")
(license (license:nonfree (format #f "file:///share/doc/nvidia-driver-~a/LICENSE" version))))) (license
(license:nonfree
(format #f "file:///share/doc/nvidia-driver-~a/LICENSE" version)))))
(define-public nvidia-exec (define-public nvidia-exec
(package (package