gnu: Remove superfluous "linux-libre-headers" inputs.

This input is already propagated from glibc.

* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Remove LINUX-LIBRE-HEADERS-5.10.
* gnu/packages/linux.scm (btrfs-progs)[native-inputs]: Likewise.
* gnu/packages/accessibility.scm (brltty)[inputs]: Remove LINUX-LIBRE-HEADERS.
* gnu/packages/graphics.scm (directfb)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (libdc1394)[inputs]: Likewise.
* gnu/packages/linux.scm (python-evdev)[native-inputs]: Likewise.
(bcc, bpftrace)[inputs]: Likewise.
* gnu/packages/networking.scm (lksctp-tools)[inputs]: Likewise.
* gnu/packages/video.scm (tslib)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (links)[native-inputs]: Likewise.
* gnu/packages/cdrom.scm (cdrtools)[inputs]: Likewise.
[arguments]: Adjust accordingly.
* gnu/packages/lirc.scm (lirc)[inputs, arguments]: Likewise.
* gnu/packages/vpn.scm (xl2tpd)[inputs, arguments]: Likewise.
This commit is contained in:
Marius Bakke 2021-12-13 16:30:26 +01:00
parent 6dffced09e
commit 467485a50a
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
11 changed files with 7 additions and 25 deletions

View file

@ -182,7 +182,6 @@ (define-public brltty
("icu" ,icu4c)
("libbraille" ,libbraille)
("libpcre2" ,pcre2)
("linux-headers" ,linux-libre-headers)
("louis" ,liblouis)
("ncurses" ,ncurses)
("polkit" ,polkit)

View file

@ -318,8 +318,6 @@ (define-public cdrtools
(patches (search-patches "cdrtools-3.01-mkisofs-isoinfo.patch"))))
(build-system gnu-build-system)
;; XXX cdrtools bundles a modified, relicensed early version of cdparanoia.
(inputs
`(("linux-headers" ,linux-libre-headers)))
(arguments
`(#:make-flags
(list "RM=rm" "LN=ln" "SYMLINK=ln -s"
@ -336,7 +334,7 @@ (define-public cdrtools
(lambda _
(substitute* "autoconf/configure"
(("/usr/src/linux")
(assoc-ref %build-inputs "linux-headers")))
(assoc-ref %build-inputs "kernel-headers")))
#t))
(add-before 'build 'substitute-dirs
(lambda _

View file

@ -874,9 +874,6 @@ (define-public ungoogled-chromium
("libxscrnsaver" ,libxscrnsaver)
("libxslt" ,libxslt)
("libxtst" ,libxtst)
;; Newer kernel headers are required for userfaultfd support; remove
;; after 'core-updates' merge.
("linux-libre-headers" ,linux-libre-headers-5.10)
("mesa" ,mesa)
("minizip" ,minizip)
("mit-krb5" ,mit-krb5)

View file

@ -182,7 +182,6 @@ (define-public directfb
("libcddb" ,libcddb)
("libdrm" ,libdrm)
("libtimidity" ,libtimidity)
("linux-headers" ,linux-libre-headers)
("mad" ,libmad)
("mng" ,libmng)
("mpeg2" ,libmpeg2)

View file

@ -155,7 +155,6 @@ (define-public libdc1394
libraw1394
libusb
libxv
linux-libre-headers
mesa
sdl
v4l-utils))

View file

@ -3879,8 +3879,6 @@ (define-public python-evdev
(sha256
(base32 "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi"))))
(build-system python-build-system)
(native-inputs
`(("kernel-headers" ,linux-libre-headers)))
(arguments
`(#:tests? #f ;no rule for tests
#:phases
@ -5456,9 +5454,6 @@ (define-public btrfs-progs
("asciidoc" ,asciidoc)
("python" ,python)
("xmlto" ,xmlto)
;; Remove this input entirely when the default headers
;; version provides blk_zone.capacity (>= 5.9).
("linux-libre-headers" ,linux-libre-headers-5.10)
;; For building documentation.
("libxml2" ,libxml2)
("docbook-xsl" ,docbook-xsl)
@ -8458,7 +8453,6 @@ (define-public bcc
;; archives, only object files.
;; https://github.com/iovisor/bcc/issues/504
("elfutils" ,elfutils)
("linux-libre-headers" ,linux-libre-headers)
("luajit" ,luajit)
("python-wrapper" ,python-wrapper)))
(arguments
@ -8533,7 +8527,7 @@ (define-public bpftrace
(native-inputs
(list bison flex))
(inputs
(list bcc clang-toolchain elfutils libbpf linux-libre-headers))
(list bcc clang-toolchain elfutils libbpf))
(arguments
`(#:tests? #f ;Tests require googletest sources.
#:configure-flags

View file

@ -69,7 +69,7 @@ (define-public lirc
(lambda* (#:key inputs #:allow-other-keys)
;; 'lirc-make-devinput' script assumes that linux headers
;; are placed in "/usr/...".
(let ((headers (assoc-ref inputs "linux-headers")))
(let ((headers (assoc-ref inputs "kernel-headers")))
(substitute* "tools/lirc-make-devinput"
(("/usr/include") (string-append headers "/include"))))
#t))
@ -89,7 +89,6 @@ (define-public lirc
(inputs
`(("libx11" ,libx11)
("libusb-compat" ,libusb-compat)
("linux-headers" ,linux-libre-headers)
("alsa-lib" ,alsa-lib)
("python" ,python)))
(home-page "https://www.lirc.org/")

View file

@ -494,8 +494,6 @@ (define-public lksctp-tools
(build-system gnu-build-system)
(native-inputs
(list autoconf automake libtool pkg-config))
(inputs
(list linux-libre-headers))
(synopsis
"@acronym{SCTP, Stream Control Transmission Protocol} helpers for Linux")
(description

View file

@ -645,8 +645,7 @@ (define-public tslib
(native-inputs
(list autoconf automake libtool pkg-config))
(inputs
`(("linux-headers" ,linux-libre-headers)
("sdl2" ,sdl2)))
`(("sdl2" ,sdl2)))
(synopsis "Touchscreen access library")
(description "TSLib is a cross-platform library that provides access to
touchscreen devices and the ability to apply filters to their input events.")

View file

@ -1083,10 +1083,10 @@ (define-public xl2tpd
(("/usr/sbin/pppd")
(search-input-file inputs "/sbin/pppd")))
(setenv "KERNELSRC"
(assoc-ref inputs "linux-libre-headers"))
(assoc-ref inputs "kernel-headers"))
#t)))
#:tests? #f)) ; no tests provided
(inputs (list libpcap linux-libre-headers ppp))
(inputs (list libpcap ppp))
(home-page "https://www.xelerance.com/software/xl2tpd/")
(synopsis "Layer 2 Tunnelling Protocol Daemon (RFC 2661)")
(description

View file

@ -181,7 +181,7 @@ (define-public links
(invoke "./configure"
(string-append "--prefix=" out)
"--enable-graphics")))))))
(native-inputs (list linux-libre-headers pkg-config))
(native-inputs (list pkg-config))
(inputs `(("gpm" ,gpm)
("libevent" ,libevent)
("libjpeg" ,libjpeg-turbo)