summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/emacs
diff options
context:
space:
mode:
authorAndreas Fuchs <asf@boinkor.net>2020-08-26 20:40:06 -0400
committerAndreas Fuchs <asf@boinkor.net>2020-08-29 23:10:38 -0400
commit861f27018d9d6d131f4a717776e81dcebc38b9f8 (patch)
tree156a14b11a7b86f5632936c749a58b08a4373039 /pkgs/applications/editors/emacs
parent175995986337e58e8ceec72d09515332fe363d3a (diff)
emacs: Fix paths to bintools on Darwin
This changes PATH such that the correct linker can be found to construct .eln files at runtime.
Diffstat (limited to 'pkgs/applications/editors/emacs')
-rw-r--r--pkgs/applications/editors/emacs/generic.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index 0d7c31b8d86d..8e2c34988b9b 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -11,7 +11,7 @@
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, jansson, harfbuzz
-, libgccjit, targetPlatform, binutils, binutils-unwrapped, makeWrapper # native-comp params
+, libgccjit, targetPlatform, binutils, clang ? null, binutils-unwrapped, makeWrapper # native-comp params
, systemd ? null
, withX ? !stdenv.isDarwin
, withNS ? stdenv.isDarwin
@@ -158,7 +158,7 @@ in stdenv.mkDerivation {
'')
(lib.optionalString nativeComp ''
- wrapProgram $out/bin/emacs-* --prefix PATH : "${lib.makeBinPath [ binutils binutils-unwrapped ]}"
+ wrapProgram $out/bin/emacs-* --prefix PATH : "${lib.makeBinPath [ clang.bintools binutils binutils-unwrapped ]}"
'')
];