Skip to content

emacs-macport: use a different hammer for the CF_NOESCAPE bug #435148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilazy merged 2 commits into from
Sep 3, 2025
Merged

emacs-macport: use a different hammer for the CF_NOESCAPE bug #435148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8ea016
emacs-macport: fix build
emilazy Sep 2, 2025
cb0db57
emacs-macport: use a different hammer for the `CF_NOESCAPE` bug
emilazy Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkgs/applications/editors/emacs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ lib.makeScope pkgs.newScope (
withPgtk = true;
};

emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
emacs29-macport = callPackage (self.sources.emacs29-macport) (
inheritedArgs
// {
srcRepo = true;
}
);
}
)
8 changes: 8 additions & 0 deletions pkgs/applications/editors/emacs/macport-noescape-noop/CoreFoundation/CFBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#if !defined(__COREFOUNDATION_CFBASE__)

#include_next <CoreFoundation/CFBase.h>

#undef CF_NOESCAPE
#define CF_NOESCAPE

#endif
31 changes: 0 additions & 31 deletions pkgs/applications/editors/emacs/macport_noescape_noop.h
View file
Open in desktop

This file was deleted.

9 changes: 2 additions & 7 deletions pkgs/applications/editors/emacs/make-emacs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
libtiff,
libwebp,
libxml2,
llvmPackages_14,
m17n_lib,
mailcap,
mailutils,
Expand Down Expand Up @@ -139,12 +138,8 @@ let
++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [
"${lib.getLib stdenv.cc.cc.lib.libgcc}/lib"
];

inherit (if variant == "macport" then llvmPackages_14.stdenv else stdenv)
mkDerivation
;
in
mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname =
pname
+ (
Expand Down Expand Up @@ -430,7 +425,7 @@ mkDerivation (finalAttrs: {
// lib.optionalAttrs (variant == "macport") {
# Fixes intermittent segfaults when compiled with LLVM >= 7.0.
# See https://github.com/NixOS/nixpkgs/issues/127902
NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}";
NIX_CFLAGS_COMPILE = "-isystem ${./macport-noescape-noop}";
};

enableParallelBuilding = true;
Expand Down
Loading