diff options
| author | Efraim Flashner <[email protected]> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/lirc.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/lirc.scm')
| -rw-r--r-- | gnu/packages/lirc.scm | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index 5c89e83d7c..c0b5780c30 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -38,14 +38,14 @@ (define-public lirc (package (name "lirc") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lirc/LIRC/" version "/lirc-" version ".tar.bz2")) (sha256 (base32 - "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb")) + "0ai27l6hxfgkwvkqa3fy1b1gqzw2y10md030y5ig4748fj1fqi1x")) (patches (search-patches "lirc-localstatedir.patch" "lirc-reproducible-build.patch")))) (build-system gnu-build-system) @@ -63,16 +63,14 @@ ;; Correct the faulty assumption that systemd support should be ;; hard-wired when a build host's /proc/version contains "Ubuntu". (substitute* "configure" - (("kernelversion=.*") "kernelversion=irrelevant\n")) - #t)) + (("kernelversion=.*") "kernelversion=irrelevant\n")))) (add-after 'unpack 'patch-lirc-make-devinput (lambda* (#:key inputs #:allow-other-keys) ;; 'lirc-make-devinput' script assumes that linux headers ;; are placed in "/usr/...". (let ((headers (assoc-ref inputs "kernel-headers"))) (substitute* "tools/lirc-make-devinput" - (("/usr/include") (string-append headers "/include")))) - #t)) + (("/usr/include") (string-append headers "/include")))))) (add-after 'unpack 'patch-doc/Makefile.in (lambda _ ;; Lirc wants to install several images and a useless html page @@ -82,8 +80,18 @@ ;; "share/doc/lirc/images/" anyway). (substitute* "doc/Makefile.in" (("^vardocs_DATA =.*") "vardocs_DATA =\n") - (("^varimage_DATA =.*") "varimage_DATA =\n")) - #t))))) + (("^varimage_DATA =.*") "varimage_DATA =\n")))) + (add-after 'unpack 'omit-pip-sourceball + ;; ‘make install’ invokes ’setup.py sdist’, which has no known (to + ;; nckx) way to enforce mtimes. The utility of this is questionable, + ;; IMO: let's disable it entirely & listen for complaints, if any. + (lambda _ + (substitute* "Makefile.in" + (("(PYTHON_TARBALL.*=).*" _ tarball=) + (string-append tarball= "\n"))))) + (add-before 'configure 'build-reproducibly + (lambda _ + (setenv "LIRC_IRDB_CACHE_ID" "build time")))))) (native-inputs (list pkg-config libxslt)) (inputs |