Merge pull request NixOS#98673 from acowley/emacsgcc-paths

emacs: fix paths for native compilation
lostnet · Sep 26, 2020 · bbecb0e · bbecb0e
2 parents 8954f32 + 30313a7
commit bbecb0e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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 \