diff options
author | Peter Hoeg <peter@speartail.com> | 2017-02-28 17:57:41 +0800 |
---|---|---|
committer | Peter Hoeg <peter@speartail.com> | 2017-02-28 17:59:09 +0800 |
commit | 23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa (patch) | |
tree | 3408b593c4d2af460ff59fb58a260b66a31acf4d /pkgs/tools/filesystems/s3fs | |
parent | 86b840d8c97ae00497be0c1d9acbc038960b5d81 (diff) | |
download | nixlib-23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa.tar nixlib-23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa.tar.gz nixlib-23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa.tar.bz2 nixlib-23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa.tar.lz nixlib-23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa.tar.xz nixlib-23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa.tar.zst nixlib-23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa.zip |
s3fs: minor cleanups
Diffstat (limited to 'pkgs/tools/filesystems/s3fs')
-rw-r--r-- | pkgs/tools/filesystems/s3fs/default.nix | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 051d27321003..fa975790d4a6 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,15 +1,22 @@ -{stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }: -stdenv.mkDerivation { - name = "s3fs-fuse-1.80"; +stdenv.mkDerivation rec { + name = "s3fs-fuse-${version}"; + version = "1.80"; - src = fetchurl { - url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.80.tar.gz; - sha256 = "0ddx5khlyyrxm4s8is4gqbczmrcivj11hmkk9s893r3kpp4q30yy"; + src = fetchFromGitHub { + owner = "s3fs-fuse"; + repo = "s3fs-fuse"; + rev = "v${version}"; + sha256 = "0yikqpdyjibbb36rj4118lv9nxgp9f5jhydzxijzxrzw29ypvw76"; }; - preConfigure = "./autogen.sh"; - buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ]; + buildInputs = [ curl openssl libxml2 fuse ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ + "--with-openssl" + ]; postInstall = '' ln -s $out/bin/s3fs $out/bin/mount.s3fs |