remove the dependency on /bin/pwd, use the pwd we have in $PATH instead

svn path=/nixpkgs/branches/nixos-pkgs/; revision=2052
This commit is contained in:
Armijn Hemel
2005-01-18 13:04:28 +00:00
parent 0e6b2045ea
commit 81e13c1572
5 changed files with 123 additions and 66 deletions
+17 -11
View File
@@ -3,17 +3,23 @@
stdenv.mkDerivation {
name = "glibc-2.3.3";
builder = ./builder.sh;
subst = ./subst.sh;
src = fetchurl {
url = http://ftp.gnu.org/pub/gnu/glibc/glibc-2.3.3.tar.bz2;
md5 = "e825807b98042f807799ccc9dd96d31b";
};
linuxthreadsSrc = fetchurl {
url = http://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.3.tar.bz2;
md5 = "8149ea62922e75bd692bc3b92e5e766b";
url = ftp://sources.redhat.com/pub/glibc/snapshots/glibc-20050110.tar.bz2;
md5 = "1171587e4802f43fdda315910adc1854";
};
#src = fetchurl {
# url = ftp://ftp.nluug.nl/pub/gnu/glibc/glibc-2.3.3.tar.bz2;
# md5 = "e825807b98042f807799ccc9dd96d31b";
#};
#linuxthreadsSrc = fetchurl {
# url = http://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.3.tar.bz2;
# md5 = "8149ea62922e75bd692bc3b92e5e766b";
#};
patches = [
patches = [ ./glibc-pwd.patch ];
#patches = [
# This patch fixes the bug
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=312. Note
# that this bug was marked as `WORKSFORME' with the comment to
@@ -22,17 +28,17 @@ stdenv.mkDerivation {
# constitutes an AXIS OF EVIL wrt release management. Patch
# obtained from
# http://www.pengutronix.de/software/ptxdist/patches-cvs/glibc-2.3.2/generic/fixup.patch.
./fixup.patch
#./fixup.patch
# Likewise, this fixes the bug reported in
# http://sources.redhat.com/ml/libc-alpha/2003-07/msg00117.html.
# Die, glibc, die.
./no-unit-at-a-time.patch
#./no-unit-at-a-time.patch
# This is a patch to make glibc compile under GCC 3.3. Presumably
# later releases of glibc won't need this.
# ./glibc-2.3.2-sscanf-1.patch
];
# # ./glibc-2.3.2-sscanf-1.patch
#];
inherit kernelHeaders installLocales;
}