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

fuse: Minor cleanup

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-12-23 01:04:17 +02:00
parent e0078b2cb5
commit 45338a3077
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,10 @@
{ stdenv, fetchFromGitHub, utillinux { stdenv, fetchFromGitHub, utillinux
,autoconf, automake, libtool, gettext }: , autoconf, automake, libtool, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fuse-${version}"; name = "fuse-${version}";
version = "2.9.7"; version = "2.9.7";
#builder = ./builder.sh;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libfuse"; owner = "libfuse";
repo = "libfuse"; repo = "libfuse";
@ -17,8 +14,6 @@ stdenv.mkDerivation rec {
buildInputs = [ utillinux autoconf automake libtool gettext ]; buildInputs = [ utillinux autoconf automake libtool gettext ];
inherit utillinux;
preConfigure = preConfigure =
'' ''
export MOUNT_FUSE_PATH=$out/sbin export MOUNT_FUSE_PATH=$out/sbin
@ -32,7 +27,7 @@ stdenv.mkDerivation rec {
sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c 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 sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
./makeconf.sh ./makeconf.sh
''; '';