summary refs log tree commit diff
diff options
context:
space:
mode:
authorDan Peebles <thetypesaretoobig@gmail.com>2015-02-08 19:15:09 -0500
committerDan Peebles <thetypesaretoobig@gmail.com>2015-02-08 19:15:09 -0500
commitd8ad39d2e60886fc4a427b171c95d3bcd116170a (patch)
treeb60bc01b78122e953f5b8db9e4332d14ded779ce
parent063c901d6cc3d074b7e08245b65e241673096602 (diff)
downloadnixlib-d8ad39d2e60886fc4a427b171c95d3bcd116170a.tar
nixlib-d8ad39d2e60886fc4a427b171c95d3bcd116170a.tar.gz
nixlib-d8ad39d2e60886fc4a427b171c95d3bcd116170a.tar.bz2
nixlib-d8ad39d2e60886fc4a427b171c95d3bcd116170a.tar.lz
nixlib-d8ad39d2e60886fc4a427b171c95d3bcd116170a.tar.xz
nixlib-d8ad39d2e60886fc4a427b171c95d3bcd116170a.tar.zst
nixlib-d8ad39d2e60886fc4a427b171c95d3bcd116170a.zip
Purification in preparation for pure-darwin merge (shouldsn't hurt anything in the meantime)
-rw-r--r--pkgs/applications/editors/emacs-24/builder.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs-24/builder.sh b/pkgs/applications/editors/emacs-24/builder.sh
index 5b86f98d61c2..984a61df6f3b 100644
--- a/pkgs/applications/editors/emacs-24/builder.sh
+++ b/pkgs/applications/editors/emacs-24/builder.sh
@@ -5,6 +5,10 @@ source $stdenv/setup
 # *our* versions, not the ones found in the system, as it would do by default.
 # On other platforms, this appears to be unnecessary.
 preConfigure() {
+    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
+        substituteInPlace $i --replace /bin/pwd pwd
+    done
+
     case "${system}" in
 	x86_64-linux)	glibclibdir=lib64 ;;
 	i686-linux)	glibclibdir=lib ;;
@@ -23,7 +27,9 @@ preConfigure() {
             --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
             --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
     done
+}
 
+preInstall () {
     for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
         substituteInPlace $i --replace /bin/pwd pwd
     done