Merge pull request #20706 from matthewbauer/emacs-macport-version-fix

emacs-macport: 6.0 -> 6.1
This commit is contained in:
Daiderd Jordan 2016-12-13 23:16:49 +01:00 committed by GitHub
commit 29d53f3d5f
2 changed files with 4 additions and 4 deletions

View file

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
"--enable-mac-app=$$out/Applications"
];
CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090";
CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
LDFLAGS = "-O3 -L${ncurses.out}/lib";
postInstall = ''

View file

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
emacsName = "emacs-25.1";
name = "${emacsName}-mac-6.0";
name = "${emacsName}-mac-6.1";
builder = ./builder.sh;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
sha256 = "2f7a3fd826e6dea541ada04f4a1ff2903a87a1f736b89c5b90bf7bb820568e34";
sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62";
};
enableParallelBuilding = true;
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
"--enable-mac-app=$$out/Applications"
];
CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090";
CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
LDFLAGS = "-O3 -L${ncurses.out}/lib";
postInstall = ''