* Switching.

svn path=/nixpkgs/trunk/; revision=6827
This commit is contained in:
Eelco Dolstra
2006-10-24 20:53:54 +00:00
parent ec0d20103c
commit 60a9aa66bf
7 changed files with 23 additions and 66 deletions

View File

@@ -5,11 +5,6 @@ export NIX_DONT_SET_RPATH=1
source $stdenv/setup
source $substitute
glibc=`cat $NIX_GCC/nix-support/orig-glibc`
echo $glibc
export LD_LIBRARY_PATH=$glibc/lib
# Explicitly tell glibc to use our pwd, not /bin/pwd.
export PWD_P=$(type -tP pwd)

View File

@@ -8,18 +8,6 @@ stdenv.mkDerivation {
builder = ./builder.sh;
substitute = ../../../build-support/substitute/substitute.sh;
/*
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/glibc-2.3.6.tar.bz2;
md5 = "bfdce99f82d6dbcb64b7f11c05d6bc96";
};
linuxthreadsSrc = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.6.tar.bz2;
md5 = "d4eeda37472666a15cc1f407e9c987a9";
};
*/
src = fetchurl {
url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2;
md5 = "1fb29764a6a650a4d5b409dda227ac9f";