emacs: darwin: use architecture-native SDK

Signed-off-by: Andrew Pan <a@tny.town>
This commit is contained in:
Andrew Pan
2024-05-02 00:03:47 -05:00
committed by Andrew Pan
parent c1a16412b4
commit d86fc0d0f1
3 changed files with 6 additions and 16 deletions
+3 -14
View File
@@ -4,25 +4,14 @@ lib.makeScope pkgs.newScope (self:
let
gconf = pkgs.gnome2.GConf;
inherit (self) callPackage;
stdenv = if pkgs.stdenv.isDarwin
then pkgs.darwin.apple_sdk_11_0.stdenv
else pkgs.stdenv;
inheritedArgs = {
inherit gconf;
inherit stdenv;
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk_11_0) llvmPackages_14;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks)
inherit (pkgs.darwin.apple_sdk.frameworks)
Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit
Quartz QuartzCore UniformTypeIdentifiers WebKit;
gnutls =
if pkgs.stdenv.isDarwin
then pkgs.gnutls.override {
inherit stdenv;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
}
else pkgs.gnutls;
Quartz QuartzCore WebKit;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers;
};
in {
sources = import ./sources.nix {
@@ -296,12 +296,13 @@ mkDerivation (finalAttrs: {
OSAKit
Quartz
QuartzCore
UniformTypeIdentifiers
WebKit
# TODO are these optional?
GSS
ImageCaptureCore
ImageIO
] ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [
UniformTypeIdentifiers
];
hardeningDisable = [ "format" ];
+1 -1
View File
@@ -30613,7 +30613,7 @@ with pkgs;
em = callPackage ../applications/editors/em { };
inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { }))
inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { }))
emacs28
emacs28-gtk2
emacs28-gtk3