JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fuse: 2.9.3 -> 2.9.5

Browse Source
This commit is contained in:
Eelco Dolstra 2016-03-19 17:21:16 +01:00
parent 25122f05b0
commit 497c828611
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/fuse/builder.sh
View File

@ -1,18 +0,0 @@
source $stdenv/setup
export MOUNT_FUSE_PATH=$out/sbin
export INIT_D_PATH=$out/etc/init.d
export UDEV_RULES_PATH=$out/etc/udev/rules.d
# This is ugly. Normally, FUSE executes $out/bin/fusermount to mount
# the file system. However, fusermount should be setuid root, but Nix
# doesn't support setuid binaries, so fusermount will fail. By
# setting FUSERMOUNT_DIR to a non-existant path, FUSE will fall back
# to searching for fusermount in $PATH. The user is responsible for
# (e.g.) setting up a setuid-wrapper for fusermount and adding it to
# $PATH.
export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/no-such-path\""
export preBuild="sed -e 's@/bin/@$utillinux/bin/@g' -i lib/mount_util.c";
genericBuild

26
pkgs/os-specific/linux/fuse/default.nix
View File

@ -1,21 +1,35 @@
{ stdenv, fetchurl, utillinux }: { stdenv, fetchurl, utillinux }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fuse-2.9.3"; name = "fuse-2.9.5";
builder = ./builder.sh; #builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/fuse/${name}.tar.gz"; url = "https://github.com/libfuse/libfuse/releases/download/fuse_2_9_5/${name}.tar.gz";
sha256 = "071r6xjgssy8vwdn6m28qq1bqxsd2bphcd2mzhq0grf5ybm87sqb"; sha256 = "1dfvbi1p57svbv2sfnbqwpnsk219spvjnlapf35azhgzqlf3g7sp";
}; };
configureFlags = "--disable-kernel-module";
buildInputs = [ utillinux ]; buildInputs = [ utillinux ];
inherit utillinux; inherit utillinux;
preConfigure =
''
export MOUNT_FUSE_PATH=$out/sbin
export INIT_D_PATH=$TMPDIR/etc/init.d
export UDEV_RULES_PATH=$out/etc/udev/rules.d
# Ensure that FUSE calls the setuid wrapper, not
# $out/bin/fusermount. It falls back to calling fusermount in
# $PATH, so it should also work on non-NixOS systems.
export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/setuid-wrappers\""
sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
'';
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://fuse.sourceforge.net/; homepage = http://fuse.sourceforge.net/;
description = "Kernel module and library that allows filesystems to be implemented in user space"; description = "Kernel module and library that allows filesystems to be implemented in user space";

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

@ -10286,7 +10286,9 @@ let
inherit (linuxPackages) kernel; inherit (linuxPackages) kernel;
}; };
fuse = callPackage ../os-specific/linux/fuse { }; fuse = callPackage ../os-specific/linux/fuse {
utillinux = utillinuxMinimal;
};
fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { }; fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { };