diff options
author | Niklas Hambüchen <mail@nh2.me> | 2020-11-16 22:38:56 +0100 |
---|---|---|
committer | Niklas Hambüchen <mail@nh2.me> | 2020-11-16 22:42:53 +0100 |
commit | c75b9da41d35619b135a3c9ecf4843328f604ca9 (patch) | |
tree | 3257b385384c15667a601ec369b91218f7fb7b2c /pkgs/development/libraries/libmtp | |
parent | 1e1eb0eb446ea7aa6abd5e90a7c2d61f8f896537 (diff) | |
download | nixpkgs-c75b9da41d35619b135a3c9ecf4843328f604ca9.tar nixpkgs-c75b9da41d35619b135a3c9ecf4843328f604ca9.tar.gz nixpkgs-c75b9da41d35619b135a3c9ecf4843328f604ca9.tar.bz2 nixpkgs-c75b9da41d35619b135a3c9ecf4843328f604ca9.tar.lz nixpkgs-c75b9da41d35619b135a3c9ecf4843328f604ca9.tar.xz nixpkgs-c75b9da41d35619b135a3c9ecf4843328f604ca9.tar.zst nixpkgs-c75b9da41d35619b135a3c9ecf4843328f604ca9.zip |
libmtp: Switch to Github, allow building from repo.
Github is where upstream's development happens now, and building from repo makes adding patches and overriding the commit easier. Also use pname+version, see #103997.
Diffstat (limited to 'pkgs/development/libraries/libmtp')
-rw-r--r-- | pkgs/development/libraries/libmtp/default.nix | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index dc5410d65fd..3a8da79b92f 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,18 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }: +{ stdenv, fetchFromGitHub, autoconf, automake, gettext, libtool, pkgconfig +, libusb1 +, libiconv +}: stdenv.mkDerivation rec { - name = "libmtp-1.1.18"; + pname = "libmtp"; + version = "1.1.18"; - src = fetchurl { - url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "1w41l93yi0dmw218daiw36rylkc8rammxx37csh1ij24q18gx03j"; + src = fetchFromGitHub { + owner = "libmtp"; + repo = "libmtp"; + rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}"; + sha256 = "0lniy0xq397zddlhsv6n4qjn0wwakli5p3ydzxmbzn0z0jgngjja"; }; outputs = [ "bin" "dev" "out" ]; - buildInputs = [ libiconv ]; - propagatedBuildInputs = [ libusb1 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + autoconf + automake + gettext + libtool + pkgconfig + ]; + + buildInputs = [ + libiconv + ]; + + propagatedBuildInputs = [ + libusb1 + ]; + + preConfigure = '' + ./autogen.sh + ''; # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; |