* gnu/packages/linux.scm (i2c-tools): Update to 4.3.
[arguments]: Up case "prefix" make-flag and add "LDFLAGS".
(i2c-tools-3): New variable.
* gnu/packages/admin.scm (novena-eeprom)[inputs]: Replace "i2c-tools" by
"i2c-tools-3".
---
gnu/packages/admin.scm | 2 +-
gnu/packages/linux.scm | 33 +++++++++++++++++++++++++++------
2 files changed, 28 insertions(+), 7 deletions(-)
Toggle diff (83 lines)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index ed66e358ea..88e514b0c6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4753,7 +4753,7 @@ (define-public novena-eeprom
(install-file "novena-eeprom" out-bin)
(install-file "novena-eeprom.8" out-share-man)))))))
(inputs
- (list i2c-tools))
+ (list i2c-tools-3))
(synopsis "Novena EEPROM editor")
(description "This package provides an editor for the Novena EEPROM.
Novena boards contain a device-dependent descriptive EEPROM that defines
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c044f2543d..e08eac1668 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -35,7 +35,7 @@
;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Stefan Stefanovi? <stefanx2ovic@gmail.com>
-;;; Copyright © 2019, 2020, 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2019-2022 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
@@ -4430,21 +4430,22 @@ (define-public iucode-tool
(define-public i2c-tools
(package
(name "i2c-tools")
- (version "3.1.1")
+ (version "4.3")
(source (origin
(method url-fetch)
(uri (string-append
"http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
- version ".tar.bz2"))
+ version ".tar.xz"))
(sha256
(base32
- "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
+ "1y0fphjd5ah2j886x8i175r7viq0hmx666hyca0wi4dzrm290qxk"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no 'check' target
#:make-flags
- ,#~(list (string-append "prefix=" #$output)
- (string-append "CC=" #$(cc-for-target)))
+ ,#~(list (string-append "PREFIX=" #$output)
+ (string-append "CC=" #$(cc-for-target))
+ (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
;; No configure script.
#:phases (modify-phases %standard-phases (delete 'configure))))
(inputs
@@ -4458,6 +4459,26 @@ (define-public i2c-tools
SMBus access.")
(license license:gpl2+)))
+;; Needed for novena-eeprom
+(define-public i2c-tools-3
+ (package
+ (inherit i2c-tools)
+ (version "3.1.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"))))
+ (arguments
+ `(#:make-flags
+ ,#~(list (string-append "prefix=" #$output)
+ (string-append "CC=" #$(cc-for-target)))
+ ,@(strip-keyword-arguments '(#:make-flags)
+ (package-arguments i2c-tools))))))
+
(define-public xsensors
(package
(name "xsensors")
--
2.34.0