diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-08 22:40:05 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-08 22:40:05 +0000 |
| commit | 162a4a6e6c3a9bf31f195356a7a783813e5ce045 (patch) | |
| tree | 028f1cd9b9e1e0af32c7cff296e7fbc3edbb449d /pkgs/os-specific | |
| parent | 6e1659b7d152f5aff51cc2aa687cea27710227c2 (diff) | |
The way how to build util-linux-ng for 'mount' to work on nixos changed.
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
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux-ng/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index 60ffeb7073763..2ae172c6c190d 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -8,21 +8,16 @@ stdenv.mkDerivation rec { sha256 = "1k1in1ba9kvh0kplri9765wh0yk68qrkk1a55dqsm21qfryc1idq"; }; + # !!! It would be better to obtain the path to the mount helpers + # (/sbin/mount.*) through an environment variable, but that's + # somewhat risky because we have to consider that mount can setuid + # root... configureFlags = '' --disable-use-tty-group --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; - - # !!! It would be better to obtain the path to the mount helpers - # (/sbin/mount.*) through an environment variable, but that's - # somewhat risky because we have to consider that mount can setuid - # root... - preConfigure = '' - substituteInPlace mount/mount.c --replace /sbin/mount. /var/run/current-system/sw/sbin/mount. - substituteInPlace mount/umount.c --replace /sbin/umount. /var/run/current-system/sw/sbin/umount. - ''; - } |