nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtpfs: Update to 2015-08-01 and move to go-packages

Browse Source
This commit is contained in:
William A. Kennington III 2015-09-02 17:36:23 -07:00
parent 72d86374f2
commit b50567912a
3 changed files with 24 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/tools/filesystems/mtpfs/default.nix
View File

@ -1,26 +0,0 @@
{ 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 ];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -7713,7 +7713,7 @@ let
mtdev = callPackage ../development/libraries/mtdev { };
mtpfs = callPackage ../tools/filesystems/mtpfs { };
mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
mu = callPackage ../tools/networking/mu {
texinfo = texinfo4;

44
pkgs/top-level/go-packages.nix
View File

@ -1036,17 +1036,12 @@ let
sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680";
};
go-fuse = buildGoPackage rec {
rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58";
name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/hanwen/go-fuse";
src = fetchFromGitHub {
inherit rev;
owner = "hanwen";
repo = "go-fuse";
sha256 = "0lycfhchn88kbs81ypz8m5jh032fpbv14gldrjirf32wm1d4f8pj";
};
subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ];
go-fuse = buildFromGitHub rec {
rev = "324ea173d0a4d90e0e97c464a6ad33f80c9587a8";
date = "2015-07-27";
owner = "hanwen";
repo = "go-fuse";
sha256 = "0r5amgnpb4g7b6kpz42vnj01w515by4yhy64s5lqf3snzjygaycf";
};
go-github = buildFromGitHub {
@ -1748,6 +1743,16 @@ let
};
};
mtpfs = buildFromGitHub {
rev = "3ef47f91c38cf1da3e965e37debfc81738e9cd94";
date = "2015-08-01";
owner = "hanwen";
repo = "go-mtpfs";
sha256 = "1f7lcialkpkwk01f7yxw77qln291sqjkspb09mh0yacmrhl231g8";
buildInputs = [ go-fuse usb ];
};
mux = buildFromGitHub {
rev = "5a8a0400500543e28b2886a8c52d21a435815411";
date = "2015-08-05";
@ -2636,18 +2641,15 @@ let
sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
};
usb = buildGoPackage rec {
usb = buildFromGitHub rec {
rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1";
name = "usb-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/hanwen/usb";
src = fetchFromGitHub {
inherit rev;
owner = "hanwen";
repo = "usb";
sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
};
date = "2014-12-17";
owner = "hanwen";
repo = "usb";
sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pkgs.libusb ];
buildInputs = [ pkgs.libusb1 ];
};
vault = buildFromGitHub {