From 962756e8183518e0d2fe2ac9a448b873a4d55ce0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 14 Oct 2018 22:09:36 -0500
Subject: [PATCH] emacs-mac: use generic builder

this builder leads to confusion, especially since it is no longer used
in the normal emacs derivation.
---
 pkgs/applications/editors/emacs/builder.sh  | 40 ---------------------
 pkgs/applications/editors/emacs/macport.nix |  2 --
 2 files changed, 42 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/builder.sh

diff --git a/pkgs/applications/editors/emacs/builder.sh b/pkgs/applications/editors/emacs/builder.sh
deleted file mode 100644
index 545520cca7c..00000000000
--- a/pkgs/applications/editors/emacs/builder.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-source $stdenv/setup
-
-# This hook is supposed to be run on Linux. It patches the proper locations of
-# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with
-# *our* versions, not the ones found in the system, as it would do by default.
-# On other platforms, this appears to be unnecessary.
-preConfigure() {
-    ./autogen.sh
-
-    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 ;;
-        *)              return;
-    esac
-
-    libc=$(cat ${NIX_CC}/nix-support/orig-libc)
-    echo "libc: $libc"
-
-    for i in src/s/*.h src/m/*.h; do
-        substituteInPlace $i \
-            --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
-            --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
-            --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
-            --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
-            --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
-}
-
-genericBuild
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 71a41da5747..0876a71cbf7 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
   macportVersion = "7.2";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
-  builder = ./builder.sh;
-
   src = fetchurl {
     url = "mirror://gnu/emacs/${emacsName}.tar.xz";
     sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";