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

The way how to build util-linux-ng for 'mount' to work on nixos changed.

Browse Source 
I make it work so it finds mount.nfs and similar tools in nixos, and now it
may even work in non-nixos, as it is going to try /sbin after /var/run/current-system/sw/sbin.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24621
This commit is contained in:
Lluís Batlle i Rossell 2010-11-08 22:40:05 +00:00
parent 6e1659b7d1
commit 162a4a6e6c
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/os-specific/linux/util-linux-ng/default.nix
View File

@ -8,21 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "1k1in1ba9kvh0kplri9765wh0yk68qrkk1a55dqsm21qfryc1idq"; sha256 = "1k1in1ba9kvh0kplri9765wh0yk68qrkk1a55dqsm21qfryc1idq";
}; };
configureFlags = ''
--disable-use-tty-group
--enable-write
${if ncurses == null then "--without-ncurses" else ""}
'';
buildInputs = stdenv.lib.optional (ncurses != null) ncurses;
# !!! It would be better to obtain the path to the mount helpers # !!! It would be better to obtain the path to the mount helpers
# (/sbin/mount.*) through an environment variable, but that's # (/sbin/mount.*) through an environment variable, but that's
# somewhat risky because we have to consider that mount can setuid # somewhat risky because we have to consider that mount can setuid
# root... # root...
preConfigure = '' configureFlags = ''
substituteInPlace mount/mount.c --replace /sbin/mount. /var/run/current-system/sw/sbin/mount. --disable-use-tty-group
substituteInPlace mount/umount.c --replace /sbin/umount. /var/run/current-system/sw/sbin/umount. --enable-write
--enable-fs-paths-default=/var/run/current-system/sw/sbin:/sbin
${if ncurses == null then "--without-ncurses" else ""}
''; '';
buildInputs = stdenv.lib.optional (ncurses != null) ncurses;
} }