Skip to content

Commit

Permalink
libmtp: Switch to Github, allow building from repo.
Browse files Browse the repository at this point in the history
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 NixOS#103997.
  • Loading branch information
nh2 committed Nov 16, 2020
1 parent 1e1eb0e commit c75b9da
Showing 1 changed file with 30 additions and 8 deletions.
38 changes: 30 additions & 8 deletions pkgs/development/libraries/libmtp/default.nix
Original file line number Diff line number Diff line change
@@ -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" ];
Expand Down

0 comments on commit c75b9da

Please sign in to comment.