ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 04:27:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #308432 from tnytown/tnytown/emacs-native-sdk

Browse Source 
emacs: darwin: use architecture-native SDK
This commit is contained in:
adisbladis 2024-07-04 18:05:49 +12:00 committed by GitHub
commit 8fa00a6192
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/editors/emacs/default.nix
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 {

3
pkgs/applications/editors/emacs/make-emacs.nix
View File

@ -298,12 +298,13 @@ mkDerivation (finalAttrs: {
OSAKit
Quartz
QuartzCore
UniformTypeIdentifiers
WebKit
# TODO are these optional?
GSS
ImageCaptureCore
ImageIO
] ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [
UniformTypeIdentifiers
];
# Emacs needs to find movemail at run time, see info (emacs) Movemail

2
pkgs/top-level/all-packages.nix
View File

@ -30236,7 +30236,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