* 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
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchhg, bison, glibc, ed, which, bash, makeWrapper, perl, ...}:
{ stdenv, fetchhg, bison, glibc, ed, which, bash, coreutils, makeWrapper, perl }:
let
version = "2010-06-09";
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo.go
sed -i 's,/bin/ed,${ed}/bin/ed,' src/cmd/6l/mkenam
sed -i -e 's,/bin/cat,${stdenv.coreutils}/bin/cat,' \
-e 's,/bin/echo,${stdenv.coreutils}/bin/echo,' \
sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
-e 's,/bin/echo,${coreutils}/bin/echo,' \
src/pkg/exec/exec_test.go
# Disabling the 'os/http/net' tests (they want files not available in