mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
Merge pull request #308432 from tnytown/tnytown/emacs-native-sdk
emacs: darwin: use architecture-native SDK
This commit is contained in:
commit
8fa00a6192
@ -4,25 +4,14 @@ lib.makeScope pkgs.newScope (self:
|
|||||||
let
|
let
|
||||||
gconf = pkgs.gnome2.GConf;
|
gconf = pkgs.gnome2.GConf;
|
||||||
inherit (self) callPackage;
|
inherit (self) callPackage;
|
||||||
stdenv = if pkgs.stdenv.isDarwin
|
|
||||||
then pkgs.darwin.apple_sdk_11_0.stdenv
|
|
||||||
else pkgs.stdenv;
|
|
||||||
inheritedArgs = {
|
inheritedArgs = {
|
||||||
inherit gconf;
|
inherit gconf;
|
||||||
inherit stdenv;
|
|
||||||
|
|
||||||
inherit (pkgs.darwin) sigtool;
|
inherit (pkgs.darwin) sigtool;
|
||||||
inherit (pkgs.darwin.apple_sdk_11_0) llvmPackages_14;
|
inherit (pkgs.darwin.apple_sdk.frameworks)
|
||||||
inherit (pkgs.darwin.apple_sdk_11_0.frameworks)
|
|
||||||
Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit
|
Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit
|
||||||
Quartz QuartzCore UniformTypeIdentifiers WebKit;
|
Quartz QuartzCore WebKit;
|
||||||
gnutls =
|
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers;
|
||||||
if pkgs.stdenv.isDarwin
|
|
||||||
then pkgs.gnutls.override {
|
|
||||||
inherit stdenv;
|
|
||||||
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
|
|
||||||
}
|
|
||||||
else pkgs.gnutls;
|
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
sources = import ./sources.nix {
|
sources = import ./sources.nix {
|
||||||
|
@ -298,12 +298,13 @@ mkDerivation (finalAttrs: {
|
|||||||
OSAKit
|
OSAKit
|
||||||
Quartz
|
Quartz
|
||||||
QuartzCore
|
QuartzCore
|
||||||
UniformTypeIdentifiers
|
|
||||||
WebKit
|
WebKit
|
||||||
# TODO are these optional?
|
# TODO are these optional?
|
||||||
GSS
|
GSS
|
||||||
ImageCaptureCore
|
ImageCaptureCore
|
||||||
ImageIO
|
ImageIO
|
||||||
|
] ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [
|
||||||
|
UniformTypeIdentifiers
|
||||||
];
|
];
|
||||||
|
|
||||||
# Emacs needs to find movemail at run time, see info (emacs) Movemail
|
# Emacs needs to find movemail at run time, see info (emacs) Movemail
|
||||||
|
@ -30236,7 +30236,7 @@ with pkgs;
|
|||||||
|
|
||||||
em = callPackage ../applications/editors/em { };
|
em = callPackage ../applications/editors/em { };
|
||||||
|
|
||||||
inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { }))
|
inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { }))
|
||||||
emacs28
|
emacs28
|
||||||
emacs28-gtk2
|
emacs28-gtk2
|
||||||
emacs28-gtk3
|
emacs28-gtk3
|
||||||
|
Loading…
Reference in New Issue
Block a user