Unverified Commit 8fa00a61 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

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

emacs: darwin: use architecture-native SDK
parents 10819e96 d86fc0d0

pkgs/applications/editors/emacs/default.nix

+3 −14
Original line number Diff line number Diff line
@@ -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 {

pkgs/applications/editors/emacs/make-emacs.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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