From 162a4a6e6c3a9bf31f195356a7a783813e5ce045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 8 Nov 2010 22:40:05 +0000 Subject: [PATCH] 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 --- .../os-specific/linux/util-linux-ng/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index 60ffeb70737..2ae172c6c19 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"; }; - 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 # (/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. + 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; }