diff options
author | Marius Bakke <marius@gnu.org> | 2022-07-27 17:53:05 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-07-27 17:53:05 +0200 |
commit | 6a3ed96af73939df69167b5736d03abf1d7ecebd (patch) | |
tree | c44435fc118e474835323ece38d5e560d0d62dc0 /gnu/packages/libusb.scm | |
parent | f7815e76b00f61959e3bae68e4d7365ace45abf1 (diff) | |
parent | 4059158e6a284976c80b0fe8f64f69868d59ab10 (diff) | |
download | guix-6a3ed96af73939df69167b5736d03abf1d7ecebd.tar.gz guix-6a3ed96af73939df69167b5736d03abf1d7ecebd.zip |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/libusb.scm')
-rw-r--r-- | gnu/packages/libusb.scm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 9d56b935a8..baeebc3bc7 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de> -;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com> @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages libusb) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -471,14 +472,14 @@ over USB.") (define-public libmtp (package (name "libmtp") - (version "1.1.19") + (version "1.1.20") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 - "0a1jlf5b2c2vylkvdd3cxjs20a96jlbrdyx7rwai5rzmcdpszd6y")))) + "1l2npk3b5v9cxhs2g01w3b13mxvin881cr085r0cyi2p5yn1s6f9")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) @@ -488,11 +489,9 @@ over USB.") ;; libmtp.pc refers to all these. (list libusb)) (arguments - `(#:configure-flags - (list "--disable-static" - (string-append "--with-udev=" - (assoc-ref %outputs "out") - "/lib/udev")))) + (list #:configure-flags + #~(list "--disable-static" + (string-append "--with-udev=" #$output "/lib/udev")))) (home-page "http://libmtp.sourceforge.net/") (synopsis "Library implementing the Media Transfer Protocol") (description "Libmtp implements an MTP (Media Transfer Protocol) |