diff options
| author | Andreas Fuchs <asf@boinkor.net> | 2020-08-30 10:58:50 -0400 |
|---|---|---|
| committer | Andreas Fuchs <asf@boinkor.net> | 2020-08-30 10:58:50 -0400 |
| commit | 3384837123766c806c0b925053799e641077f570 (patch) | |
| tree | b3752b3f9d351d0176a0b58b33f3909986ec6a84 /pkgs/applications/editors/emacs | |
| parent | ad7a3fb3f691a12fc95ecee91995fd2f440701b1 (diff) | |
emacs: Use stdenv's bintools instead of clang
This way, we don't have to drag clang or binutils/binutils-wrapped
into the emacs closure, and can instead rely on using the correct one
for the platform we're running on.
Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index be4b343f4e58..46c6a982d404 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, clang ? null, binutils-unwrapped, makeWrapper # native-comp params +, libgccjit, targetPlatform, 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 [ clang.bintools binutils binutils-unwrapped ]}" + wrapProgram $out/bin/emacs-* --prefix PATH : "${lib.makeBinPath [ stdenv.cc.bintools stdenv.cc.bintools.bintools ]}" '') ]; |