me
/
guix
Archived
1
0
Fork 0
Code

gnu: libusb4java: Update to 1.3.1-1.0842e81. 

* gnu/packages/libusb.scm (libusb4java): Update to 1.3.1-1.0842e81.
[arguments]: Remove 'disable-Werror phase; remove trailing #T from build
phases; use G-expression.

Change-Id: I9d9ef6d9ede5254ee7a130aec182ad53b2823bbe
master
Ricardo Wurmus 2024-04-07 19:34:00 +02:00
parent 298aed72a2
commit 81b2765140
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/libusb.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@ -137,11 +137,11 @@ version of libusb to run with newer libusb.")
(define-public libusb4java (define-public libusb4java
;; There is no public release so we take the latest version from git. ;; There is no public release so we take the latest version from git.
(let ((commit "396d642a57678a0d9663b062c980fe100cc0ea1e") (let ((commit "0842e8104d8772da873314e233aa625f5651fd34")
(revision "1")) (revision "1"))
(package (package
(name "libusb4java") (name "libusb4java")
(version (string-append "0-" revision "." (string-take commit 9))) (version (git-version "1.3.1" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -150,23 +150,16 @@ version of libusb to run with newer libusb.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0wqgapalhfh9v38ycbl6i2f5lh1wpr6fzwn5dwd0rdacypkd1gml")))) "16hz0h8fvrr764gwj90yny1kxpf0y7p2czr7pdrw3qby21fqkzrq"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests (list
#:phases #:tests? #f ;there are no tests
(modify-phases %standard-phases #:phases
;; FIXME: libusb 1.0.22 deprecated libusb_set_debug, so the build #~(modify-phases %standard-phases
;; fails because libusb4java uses a deprecated procedure. (add-before 'configure 'set-JAVA_HOME
(add-after 'unpack 'disable-Werror (lambda _
(lambda _ (setenv "JAVA_HOME" #$(this-package-native-input "jdk")))))))
(substitute* "CMakeLists.txt"
(("-Werror") ""))
#t))
(add-before 'configure 'set-JAVA_HOME
(lambda* (#:key inputs #:allow-other-keys)
(setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
#t)))))
(inputs (inputs
(list libusb)) (list libusb))
(native-inputs (native-inputs