mtpfs: Fix accidental deletion

This commit is contained in:
William A. Kennington III 2015-09-02 17:39:42 -07:00
parent b50567912a
commit acd17d21b3
3 changed files with 28 additions and 31 deletions

View File

@ -1,29 +0,0 @@
{ lib, goPackages, pkgconfig, libmtp, fetchFromGitHub }:
with goPackages;
buildGoPackage rec {
rev = "9c2b46050e8ea8574eaec2124867ac7b11e6471d";
name = "go-mtpfs-${lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/hanwen/go-mtpfs";
src = fetchFromGitHub {
inherit rev;
owner = "hanwen";
repo = "go-mtpfs";
sha256 = "0kxi18cb078q4wikfajp3yvp802wzfsfdp431j0dg2jdw8y7gfii";
};
buildInputs = [ go-fuse libmtp usb ];
subPackages = [ "./" ];
dontInstallSrc = true;
meta = with lib; {
description = "A simple FUSE filesystem for mounting Android devices as a MTP device";
homepage = https://github.com/hanwen/go-mtpfs;
maintainers = with maintainers; [ bennofs ];
platforms = platforms.linux;
license = licenses.bsd3;
};
}

View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }:
stdenv.mkDerivation rec {
name = "mtpfs-1.1";
buildInputs = [ pkgconfig fuse libmtp glib libid3tag libmad ];
# adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs
preConfigure = ''
export MAD_CFLAGS=${libmad}/include
export MAD_LIBS=${libmad}/lib/libmad.so
export LIBS=${libid3tag}/lib/libid3tag.so
'';
src = fetchurl {
url = "http://www.adebenham.com/files/mtp/${name}.tar.gz";
sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv";
};
meta = {
homepage = https://code.google.com/p/mtpfs/;
description = "FUSE Filesystem providing access to MTP devices";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.qknight ];
};
}

View File

@ -1693,7 +1693,7 @@ let
goaccess = callPackage ../tools/misc/goaccess { };
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
go-mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
@ -7713,7 +7713,7 @@ let
mtdev = callPackage ../development/libraries/mtdev { };
mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
mtpfs = callPackage ../tools/filesystems/mtpfs { };
mu = callPackage ../tools/networking/mu {
texinfo = texinfo4;