summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Hodina <phodina@protonmail.com>2022-03-07 09:55:40 +0100
committerJonathan Brielmaier <jonathan.brielmaier@web.de>2022-06-26 12:36:23 +0200
commit668fda08550b29aab84d040ad6a56896864f3b1d (patch)
tree1f2831c837aeaf30ee1eae5871df2bb58a23ab60
parent387d13492fbc7f9e862c558a87255fa436aa0f7a (diff)
nongnu: nvidia-driver: Simplify inputs.
* nongnu/packages/nvidia.scm (nvidia-driver): Simplify inputs. Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
-rw-r--r--nongnu/packages/nvidia.scm55
1 files changed, 28 insertions, 27 deletions
diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm
index b473427..b5b77b6 100644
--- a/nongnu/packages/nvidia.scm
+++ b/nongnu/packages/nvidia.scm
@@ -205,8 +205,7 @@
(string-append #$cairo "/lib")
(string-append #$gdk-pixbuf "/lib")
(string-append #$wayland "/lib")
- ; TODO: Replace this assoc-ref
- (string-append (assoc-ref inputs "gcc:lib") "/lib"))
+ (string-append #$gcc:lib "/lib"))
":")))
(define (patch-elf file)
(format #t "Patching ~a ...~%" file)
@@ -250,29 +249,31 @@
(string-append #$output "/lib/xorg/modules/extensions/" "libglxserver_nvidia.so"))))))))
(supported-systems '("x86_64-linux"))
(native-inputs
- `(("patchelf" ,patchelf)
- ("perl" ,perl)
- ("python" ,python-2)
- ("which" ,which)
- ("xz" ,xz)))
+ (list
+ patchelf
+ perl
+ python-2
+ which
+ xz))
(inputs
- `(("atk" ,atk)
- ("bash-minimal" ,bash-minimal)
- ("cairo" ,cairo)
- ("coreutils" ,coreutils)
- ("gcc:lib" ,gcc "lib")
- ("gdk-pixbuf" ,gdk-pixbuf)
- ("glib" ,glib)
- ("grep" ,grep)
- ("gtk+" ,gtk+)
- ("gtk2" ,gtk+-2)
- ("kmod" ,kmod)
- ("libc" ,glibc)
- ("libx11" ,libx11)
- ("libxext" ,libxext)
- ("linux" ,linux-lts)
- ("pango" ,pango)
- ("wayland" ,wayland)))
+ (list
+ atk
+ bash-minimal
+ cairo
+ coreutils
+ `(,gcc "lib")
+ gdk-pixbuf
+ glib
+ grep
+ gtk+
+ gtk+-2
+ kmod
+ glibc
+ libx11
+ libxext
+ linux-lts
+ pango
+ wayland))
(home-page "https://www.nvidia.com")
(synopsis "Proprietary Nvidia driver")
(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 (assoc-ref inputs "atk") "/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 "glib") "/lib")
- (string-append (assoc-ref inputs "gtk+") "/lib")
- (string-append (assoc-ref inputs "gtk2") "/lib")
+ (string-append (assoc-ref inputs gtk+) "/lib")
+ (string-append (assoc-ref inputs gtk2+-) "/lib")
(string-append (assoc-ref inputs "libx11") "/lib")
(string-append (assoc-ref inputs "libxext") "/lib")
(string-append (assoc-ref inputs "pango") "/lib")