diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-02 17:39:42 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-02 17:39:42 -0700 |
commit | acd17d21b38c03235a35dab7e8af1df7069f41fd (patch) | |
tree | fc73311e83aa9230ae61cc45cf246e437cfaa21e /pkgs/tools/filesystems | |
parent | b50567912ae2329a4bc9b9d29900649c18be48f6 (diff) | |
download | nixpkgs-acd17d21b38c03235a35dab7e8af1df7069f41fd.tar nixpkgs-acd17d21b38c03235a35dab7e8af1df7069f41fd.tar.gz nixpkgs-acd17d21b38c03235a35dab7e8af1df7069f41fd.tar.bz2 nixpkgs-acd17d21b38c03235a35dab7e8af1df7069f41fd.tar.lz nixpkgs-acd17d21b38c03235a35dab7e8af1df7069f41fd.tar.xz nixpkgs-acd17d21b38c03235a35dab7e8af1df7069f41fd.tar.zst nixpkgs-acd17d21b38c03235a35dab7e8af1df7069f41fd.zip |
mtpfs: Fix accidental deletion
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/go-mtpfs/default.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/filesystems/mtpfs/default.nix | 26 |
2 files changed, 26 insertions, 29 deletions
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix deleted file mode 100644 index cf521425a76..00000000000 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix new file mode 100644 index 00000000000..7725b0d7af8 --- /dev/null +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -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 ]; + }; +} |