From 23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 28 Feb 2017 17:57:41 +0800
Subject: s3fs: minor cleanups

---
 pkgs/tools/filesystems/s3fs/default.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'pkgs/tools/filesystems/s3fs/default.nix')

diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 051d2732100..fa975790d4a 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
-- 
cgit 1.4.1