-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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.
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
emacs: use llvmPackages_14
from apple_sdk_11_0
#253892
Conversation
Fixes issues with macport x86_64 build. Signed-off-by: Andrew Pan <[email protected]>
apple_sdk_11_0
llvmPackages_14
from apple_sdk_11_0
Is there any plan to merge this to NixOS:23.05 as this is also failing in stable branch? |
I could possibly try, however I don't have Darwin. |
I believe the regression shouldn't be present on 23.05, as #252244 hasn't been backported. If you're referring to the build issues with Apple Silicon, the |
I believe this commit broke emacs on macOS 10.14. The resulting binaries fail with
I presume because they are now linking with a newer SDK that has the I was able to fix it with this overlay: emacs-nox = let
inherit (final) lib stdenv;
in prev.emacs-nox.overrideAttrs (old: {
configureFlags = old.configureFlags ++ lib.optionals stdenv.isDarwin [
"ac_cv_func_aligned_alloc=no"
"ac_cv_have_decl_aligned_alloc=no"
"ac_cv_func_posix_spawn_file_actions_addchdir_np=no"
];
}); |
@quentinmit that's odd -- is it this specific commit that broke i believe this change should have only affected the nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix Lines 138 to 140 in 6be6220
sorry for the breakage! |
It certainly could have been one of the earlier commits you listed; I assumed it was this one just based on the commit message about switching to a newer SDK. No worries! |
I'm seeing the same problem on 10.14 with
|
We might be able to fix this by removing the SDK hacks. It seems like the newly required libraries are gated on the 11.0 SDKs. |
Description of changes
Explicitly pull in
llvmPackages_14
fromapple_sdk_11_0
for Emacs. This should pull in the correctLibsystem
headers and resolve the remaining compilation issues related to the new SDK.Tested:
emacs28-macport.withPackages
nix repl
(nix repl --expr 'import ./.{system="x86_64-darwin";}'
), evaluate:b emacs28-macport.pkgs.withPackages (epkgs: with epkgs.melpaStablePackages; [ magit ])
result/bin/emacs -nw --batch --eval '(print (progn (package-initialize) (magit-version)))'
yields"3.3.0"
, indicating that Magit has been correctly installedemacs28-macport
result/Applications/Emacs.app
contains anInfo.plist
I've only tested this under Rosetta on an ARM Mac, so I'd appreciate any testing from those on Intel Macs.
Resolves #253502.
CC @sixtysecrun, @knl, @AndersonTorres
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)