From e1e5def9946e80d7cda132dd0a3f136843958042 Mon Sep 17 00:00:00 2001 From: Charles Gardner <1515419+opsroller@users.noreply.github.com> Date: Wed, 19 Mar 2025 23:07:02 -0600 Subject: [PATCH] Revert "emacs: set `FD_SETSIZE` and `DARWIN_UNLIMITED_SELECT` on darwin" --- pkgs/applications/editors/emacs/make-emacs.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index e203a5fd3506..ef8a5d923822 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -460,13 +460,10 @@ mkDerivation (finalAttrs: { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths; } - // { - NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - # Fixes intermittent segfaults when compiled with LLVM >= 7.0. - # See https://github.com/NixOS/nixpkgs/issues/127902 - (lib.optionalString (variant == "macport") "-include ${./macport_noescape_noop.h}") - (lib.optionalString stdenv.hostPlatform.isDarwin "-DFD_SETSIZE=10000 -DDARWIN_UNLIMITED_SELECT") - ]; + // 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}"; }; enableParallelBuilding = true;