emacs-mac: use generic builder
this builder leads to confusion, especially since it is no longer used in the normal emacs derivation.
This commit is contained in:
parent
b1cb653ce3
commit
962756e818
@ -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
|
|
@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
|
|||||||
macportVersion = "7.2";
|
macportVersion = "7.2";
|
||||||
name = "emacs-mac-${emacsVersion}-${macportVersion}";
|
name = "emacs-mac-${emacsVersion}-${macportVersion}";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/emacs/${emacsName}.tar.xz";
|
url = "mirror://gnu/emacs/${emacsName}.tar.xz";
|
||||||
sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";
|
sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";
|
||||||
|
Loading…
Reference in New Issue
Block a user