Merge pull request #253041 from marsam/fix-emacs-x86_64-darwin

emacs: fix build on x86_64-darwin
This commit is contained in:
Weijia Wang
2023-09-05 21:48:28 +02:00
committed by GitHub
@@ -4,13 +4,19 @@ 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.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;
};
in {
sources = import ./sources.nix {