From fa72d1897a3feee9f6258df21e3f505618052f9b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 14:32:08 +0100 Subject: gnu: libmtp: Remove unnecessary propagation. * gnu/packages/libusb.scm (libmtp)[propagated-inputs]: Move LIBGCRYPT ... [inputs]: ... here. New field. --- gnu/packages/libusb.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libusb.scm') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index abf11400e3..ba9bf92da3 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -466,10 +466,11 @@ over USB.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libgcrypt" ,libgcrypt))) (propagated-inputs ;; libmtp.pc refers to all these. - `(("libgcrypt" ,libgcrypt) - ("libusb" ,libusb))) + `(("libusb" ,libusb))) (arguments `(#:configure-flags (list (string-append "--with-udev=" -- cgit v1.2.3 From 34a3566f406bd867a39483a57f5132e227088a5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 14:33:06 +0100 Subject: gnu: libmtp: Do not build the static library. * gnu/packages/libusb.scm (libmtp)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/libusb.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/libusb.scm') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index ba9bf92da3..f1cd625f36 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -473,7 +473,8 @@ over USB.") `(("libusb" ,libusb))) (arguments `(#:configure-flags - (list (string-append "--with-udev=" + (list "--disable-static" + (string-append "--with-udev=" (assoc-ref %outputs "out") "/lib/udev")))) (home-page "http://libmtp.sourceforge.net/") -- cgit v1.2.3 From e71ef4c138a16e6eedd36173607f09e035be2d2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Feb 2020 13:23:30 +0100 Subject: gnu: libmtp: Update to 1.1.17. * gnu/packages/libusb.scm (libmtp): Update to 1.1.17. --- gnu/packages/libusb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libusb.scm') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index f1cd625f36..f41ed6b9bc 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -455,14 +455,14 @@ over USB.") (define-public libmtp (package (name "libmtp") - (version "1.1.16") + (version "1.1.17") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 - "185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v")))) + "1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3