From 30313a797d94f04bd068fdd10e04d1a9af59f8d9 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 24 Sep 2020 14:54:36 -0400
Subject: [PATCH] emacs: fix paths for native compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The given paths gives rise to errors such as,
```
x86_64-unknown-linux-gnu-gcc-9.3.0: fatal error: cannot execute ‘as’: execvp: No such file or directory
compilation terminated.
```
in the `*Async-native-compile-log*` buffer.
Fixes <https://github.com/nix-community/emacs-overlay/issues/69>
---
pkgs/applications/editors/emacs/generic.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index 71bb472d0973..f2904f3e012b 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -75,9 +75,9 @@ in stdenv.mkDerivation {
"${lib.getLib stdenv.cc.libc}/lib"
# Executable paths necessary for compilation (ld, as):
- "${lib.getBin stdenv.cc.cc}"
- "${lib.getBin stdenv.cc.bintools}"
- "${lib.getBin stdenv.cc.bintools.bintools}"
+ "${lib.getBin stdenv.cc.cc}/bin"
+ "${lib.getBin stdenv.cc.bintools}/bin"
+ "${lib.getBin stdenv.cc.bintools.bintools}/bin"
]));
in ''
substituteInPlace lisp/emacs-lisp/comp.el --replace \