From 25cfafdf5bf7fe2fdae3771d3d817df114987384 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 25 Nov 2016 00:00:49 -0600 Subject: [PATCH] emacs-macport: fix "Carbon.h" present but cannot be compiled 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. --- pkgs/applications/editors/emacs/macport-24.5.nix | 2 +- pkgs/applications/editors/emacs/macport-25.1.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix index 885538dc883..8a33155d62b 100644 --- a/pkgs/applications/editors/emacs/macport-24.5.nix +++ b/pkgs/applications/editors/emacs/macport-24.5.nix @@ -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 = '' diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix index 81e77c725d9..0f947a1f46a 100644 --- a/pkgs/applications/editors/emacs/macport-25.1.nix +++ b/pkgs/applications/editors/emacs/macport-25.1.nix @@ -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 = ''