Author: rob
Date: Wed Jun 8 13:03:10 2011
New Revision: 27398
URL: https://svn.nixos.org/websvn/nix/?rev=27398&sc=1
Log:
fixing inetutils build
Modified:
hydra-config/gnu/trunk/inetutils/release.nix
Modified: hydra-config/gnu/trunk/inetutils/release.nix
==============================================================================
--- hydra-config/gnu/trunk/inetutils/release.nix Wed Jun 8 12:04:47
2011 (r27397)
+++ hydra-config/gnu/trunk/inetutils/release.nix Wed Jun 8 13:03:10
2011 (r27398)
@@ -60,6 +60,7 @@
}:
releaseTools.sourceTarball {
+
name = "inetutils-tarball";
src = inetutilsSrc;
@@ -101,11 +102,19 @@
name = "inetutils";
src = tarball;
VERBOSE = 1;
- buildInputs = [ pkgs.ncurses ]
+ buildInputs = [ pkgs.ncurses pkgs.procps ]
++ (pkgs.lib.optional pkgs.stdenv.isLinux pkgs.nettools);
configureFlags =
[ "--with-ncurses-include-dir=${pkgs.ncurses}/include" ];
inherit preBuild meta succeedOnFailure keepBuildDirectory;
+
+ preConfigure = ''
+ export PATH=$PATH:${pkgs.nettools}/sbin
+ export USER=`${pkgs.coreutils}/bin/whoami`
+ '';
+
+ # needed because make check need /etc/protocols
+ __noChroot=true;
};
build_shishi =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits