diff options
| author | rushmorem <rushmore@webenchanter.com> | 2016-09-14 20:26:51 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-09-16 22:28:14 +0200 |
| commit | 7be7620e517fa33605850e4d9b12d71cb5f74753 (patch) | |
| tree | 2c93f360a3418ef5e7e5e74b8797312e0122717a /pkgs/os-specific/linux/fuse | |
| parent | 2d2c311304a674d1eb8fbe6c53f719d9ae51e76e (diff) | |
| download | nixlib-7be7620e517fa33605850e4d9b12d71cb5f74753.tar nixlib-7be7620e517fa33605850e4d9b12d71cb5f74753.tar.gz nixlib-7be7620e517fa33605850e4d9b12d71cb5f74753.tar.bz2 nixlib-7be7620e517fa33605850e4d9b12d71cb5f74753.tar.lz nixlib-7be7620e517fa33605850e4d9b12d71cb5f74753.tar.xz nixlib-7be7620e517fa33605850e4d9b12d71cb5f74753.tar.zst nixlib-7be7620e517fa33605850e4d9b12d71cb5f74753.zip | |
fuse: 2.9.5 -> 2.9.7
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index d86eb2a9756a..46f242b2ea0c 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, utillinux }: +{ stdenv, fetchFromGitHub, utillinux + ,autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { - name = "fuse-2.9.5"; + name = "fuse-${version}"; + + version = "2.9.7"; #builder = ./builder.sh; - src = fetchurl { - url = "https://github.com/libfuse/libfuse/releases/download/fuse_2_9_5/${name}.tar.gz"; - sha256 = "1dfvbi1p57svbv2sfnbqwpnsk219spvjnlapf35azhgzqlf3g7sp"; + src = fetchFromGitHub { + owner = "libfuse"; + repo = "libfuse"; + rev = name; + sha256 = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; }; - buildInputs = [ utillinux ]; + buildInputs = [ utillinux autoconf automake libtool gettext ]; inherit utillinux; @@ -26,12 +31,15 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/setuid-wrappers\"" sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c + sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh + + ./makeconf.sh ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://fuse.sourceforge.net/; + homepage = https://github.com/libfuse/libfuse; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; maintainers = [ maintainers.mornfall ]; |