diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2007-12-25 12:29:02 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2007-12-25 12:29:02 +0000 |
| commit | a7fada56488fafcc337b957e73f3ff6b1b2b1cc9 (patch) | |
| tree | 2cf992ecf6e9db9684bcbd85710851dbdc5ac921 /pkgs/os-specific/linux/fuse | |
| parent | 07eedae576e3b668afce445a6e48d54d0f4387e0 (diff) | |
| download | nixpkgs-a7fada56488fafcc337b957e73f3ff6b1b2b1cc9.tar nixpkgs-a7fada56488fafcc337b957e73f3ff6b1b2b1cc9.tar.gz nixpkgs-a7fada56488fafcc337b957e73f3ff6b1b2b1cc9.tar.bz2 nixpkgs-a7fada56488fafcc337b957e73f3ff6b1b2b1cc9.tar.lz nixpkgs-a7fada56488fafcc337b957e73f3ff6b1b2b1cc9.tar.xz nixpkgs-a7fada56488fafcc337b957e73f3ff6b1b2b1cc9.tar.zst nixpkgs-a7fada56488fafcc337b957e73f3ff6b1b2b1cc9.zip | |
Added Firefox-3b2 (still no idea why it crashes, though), fixed updated FUSE, made relfs_grant add user if none exists
svn path=/nixpkgs/trunk/; revision=9967
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/fuse/builder.sh b/pkgs/os-specific/linux/fuse/builder.sh index 5f0d53954e7..c843ae6183b 100644 --- a/pkgs/os-specific/linux/fuse/builder.sh +++ b/pkgs/os-specific/linux/fuse/builder.sh @@ -13,4 +13,6 @@ export UDEV_RULES_PATH=$out/etc/udev/rules.d # $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 diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index c68ccb65a75..7e3bb66b16f 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +args: with args; stdenv.mkDerivation { name = "fuse-2.7.2"; @@ -7,7 +7,10 @@ stdenv.mkDerivation { url = mirror://sourceforge/fuse/fuse-2.7.2.tar.gz; sha256 = "1zxssdiirf19mihbnxpy0kiix35d4256b9lani7qwqi7m940jfgv"; }; - configureFlags = [ "--disable-kernel-module" ]; + configureFlags = [ "--disable-kernel-module"]; + buildInputs = [ utillinux ]; + + inherit utillinux; meta = { homepage = http://fuse.sourceforge.net/; |