public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs-macport: fix "Carbon.h" present but cannot be compiled

Browse Source 
Previously, emacs-macport was giving the error:

- AppKit/AppKit.h: present but cannot be compiled
- Carbon/Carbon.h: present but cannot be compiled

This add "MAC_OS_X_VERSION_MIN_REQUIRED=1090" to CFLAGS to allow them
to compile with the new 10.10 headers.

Fixes #20682.
This commit is contained in:
Matthew Bauer 2016-11-25 00:00:49 -06:00
parent 38d77bc86b
commit 25cfafdf5b
No known key found for this signature in database
GPG Key ID: E04D0AD9469141C3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs/macport-24.5.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
"--enable-mac-app=$$out/Applications" "--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"; LDFLAGS = "-O3 -L${ncurses.out}/lib";
postInstall = '' postInstall = ''

2
pkgs/applications/editors/emacs/macport-25.1.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
"--enable-mac-app=$$out/Applications" "--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"; LDFLAGS = "-O3 -L${ncurses.out}/lib";
postInstall = '' postInstall = ''