* Get rid of the ugly `useFromStdenv' hack in all-packages.nix.

Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
This commit is contained in:
Eelco Dolstra
2010-08-06 10:34:34 +00:00
parent d8ba69a16e
commit a1e834e85a
11 changed files with 73 additions and 128 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper }:
{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }:
stdenv.mkDerivation rec {
name = "dhcp-4.1.1-P1";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/sbin/dhclient-script \
--replace /sbin/ip ${iproute}/sbin/ip
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${stdenv.coreutils}/bin:${stdenv.gnused}/bin"
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"
'';
preConfigure =