diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/lirc.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/lirc.scm')
| -rw-r--r-- | gnu/packages/lirc.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index f840f49a23..1b8e8e37bd 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -69,7 +69,7 @@ (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)) @@ -85,12 +85,10 @@ (("^varimage_DATA =.*") "varimage_DATA =\n")) #t))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("libxslt" ,libxslt))) + (list pkg-config libxslt)) (inputs `(("libx11" ,libx11) ("libusb-compat" ,libusb-compat) - ("linux-headers" ,linux-libre-headers) ("alsa-lib" ,alsa-lib) ("python" ,python))) (home-page "https://www.lirc.org/") @@ -123,9 +121,9 @@ on just one button press.") "13s9zqyfh871ls1aha47rhmk13b4mcyfckcn2sw70bvc26832gk6")))) (build-system python-build-system) (inputs - `(("lirc" ,lirc))) + (list lirc)) (native-inputs - `(("python-cython" ,python-cython))) + (list python-cython)) (arguments `(#:tests? #f ; the only tests that exist are interactive #:phases |