From bdce9a2bc24462430553415ee6b00017a24059cb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 Sep 2023 04:20:00 +0000 Subject: [PATCH] emacs: fix build on x86_64-darwin --- pkgs/applications/editors/emacs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 81e4667c1fb0..246b43b779e0 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -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 {