alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* util-linux: added an option to build just mount/umount, and an

Browse source 
option to set the path to the mount helpers programs
  (mount.<fstype>) to something other than /sbin.  Needed in NixOS to
  get the mount command to work for NTFS-3G, CIFS, etc.

svn path=/nixpkgs/trunk/; revision=12514
This commit is contained in:
Eelco Dolstra 2008-08-06 15:27:50 +00:00
parent 63b9500b88
commit 0a884b25f9
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkgs/os-specific/linux/util-linux/default.nix
View file

@ -1,7 +1,15 @@
{stdenv, fetchurl, ncurses ? null}: { stdenv, fetchurl, ncurses ? null
, # Build mount/umount only.
buildMountOnly ? false
, # A directory containing mount helpers programs
# (i.e. `mount.<fstype>') to be used instead of /sbin.
mountHelpers ? null
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "util-linux-2.13-pre7"; name = (if buildMountOnly then "mount-" else "") + "util-linux-2.13-pre7";
src = fetchurl { src = fetchurl {
url = mirror://kernel/linux/utils/util-linux/testing/util-linux-2.13-pre7.tar.bz2; url = mirror://kernel/linux/utils/util-linux/testing/util-linux-2.13-pre7.tar.bz2;
@ -21,10 +29,28 @@ stdenv.mkDerivation {
buildInputs = stdenv.lib.optional (ncurses != null) ncurses; buildInputs = stdenv.lib.optional (ncurses != null) ncurses;
preBuild = '' inherit mountHelpers;
preConfigure = ''
makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt) makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt)
if test -n "$mountHelpers"; then
substituteInPlace mount/mount.c --replace /sbin/mount. $mountHelpers/mount.
substituteInPlace mount/umount.c --replace /sbin/umount. $mountHelpers/umount.
fi
''; '';
buildPhase =
if buildMountOnly then ''
make "''${makeFlagsArray[@]}" -C lib
make "''${makeFlagsArray[@]}" -C mount
'' else "";
installPhase =
if buildMountOnly then ''
make "''${makeFlagsArray[@]}" -C lib install
make "''${makeFlagsArray[@]}" -C mount install
'' else "";
# Hack to get static builds to work. # Hack to get static builds to work.
NIX_CFLAGS_COMPILE = "-DHAVE___PROGNAME=1"; NIX_CFLAGS_COMPILE = "-DHAVE___PROGNAME=1";
} }