Skip to content

Commit a94bce7

Browse files
authoredMar 21, 2025
Revert "emacs: set FD_SETSIZE and DARWIN_UNLIMITED_SELECT on darwin" (#391475)
2 parents 7475c7a + e1e5def commit a94bce7

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed
 

‎pkgs/applications/editors/emacs/make-emacs.nix

+4-7
Original file line numberDiff line numberDiff line change
@@ -460,13 +460,10 @@ mkDerivation (finalAttrs: {
460460
NATIVE_FULL_AOT = "1";
461461
LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
462462
}
463-
// {
464-
NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
465-
# Fixes intermittent segfaults when compiled with LLVM >= 7.0.
466-
# See https://github.com/NixOS/nixpkgs/issues/127902
467-
(lib.optionalString (variant == "macport") "-include ${./macport_noescape_noop.h}")
468-
(lib.optionalString stdenv.hostPlatform.isDarwin "-DFD_SETSIZE=10000 -DDARWIN_UNLIMITED_SELECT")
469-
];
463+
// lib.optionalAttrs (variant == "macport") {
464+
# Fixes intermittent segfaults when compiled with LLVM >= 7.0.
465+
# See https://github.com/NixOS/nixpkgs/issues/127902
466+
NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}";
470467
};
471468

472469
enableParallelBuilding = true;

0 commit comments

Comments
 (0)
Failed to load comments.