From 78d2e3cb302b9db3a4ef1f3437e766f1a712bf5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Jun 2008 20:04:42 +0000
Subject: [PATCH] * Fix on x86_64 (borrowed from emacs-unicode).
svn path=/nixpkgs/branches/stdenv-updates/; revision=12043
---
pkgs/applications/editors/emacs-22/builder.sh | 21 ++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/pkgs/applications/editors/emacs-22/builder.sh b/pkgs/applications/editors/emacs-22/builder.sh
index e9c909739d53..6bb6c54a5b8f 100644
--- a/pkgs/applications/editors/emacs-22/builder.sh
+++ b/pkgs/applications/editors/emacs-22/builder.sh
@@ -1,13 +1,20 @@
source $stdenv/setup
-myglibc=`cat ${NIX_GCC}/nix-support/orig-libc`
-echo "glibc: $myglibc"
+preConfigure=preConfigure
+preConfigure() {
+ libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
+ echo "libc: $libc"
-postConfigure() {
- cp $myglibc/lib/crt1.o src
- cp $myglibc/lib/crti.o src
- cp $myglibc/lib/crtn.o src
+ for i in src/s/*.h src/m/*.h; do
+ substituteInPlace $i \
+ --replace /usr/lib/crt1.o $libc/lib/crt1.o \
+ --replace /usr/lib/crti.o $libc/lib/crti.o \
+ --replace /usr/lib/crtn.o $libc/lib/crtn.o
+ done
+
+ for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
+ substituteInPlace $i --replace /bin/pwd pwd
+ done
}
-postConfigure=postConfigure
genericBuild