diff options
Diffstat (limited to 'pkgs/applications/editors/emacs/make-emacs.nix')
| -rw-r--r-- | pkgs/applications/editors/emacs/make-emacs.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 59cced7ec49a5..f995b073d3777 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -60,6 +60,7 @@ , texinfo , webkitgtk , wrapGAppsHook3 +, zlib # Boolean flags , withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform @@ -135,8 +136,8 @@ let libGccJitLibraryPaths = [ "${lib.getLib libgccjit}/lib/gcc" "${lib.getLib stdenv.cc.libc}/lib" - ] ++ lib.optionals (stdenv.cc?cc.libgcc) [ - "${lib.getLib stdenv.cc.cc.libgcc}/lib" + ] ++ lib.optionals (stdenv.cc?cc.lib.libgcc) [ + "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib" ]; inherit (if variant == "macport" @@ -250,6 +251,7 @@ mkDerivation (finalAttrs: { glib-networking ] ++ lib.optionals withNativeCompilation [ libgccjit + zlib ] ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals withPgtk [ @@ -298,12 +300,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 |