public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs: Set native-comp library path as linker flags instead 

Since Darwin's linker does not understand LIBRARY_PATH, we have to set
the library path as explicit linker flags: This requires a very recent
feature/native-comp emacs revision, but it runs on Darwin and
correctly compiles files at runtime.
This commit is contained in:
Andreas Fuchs 2020-08-26 20:37:35 -04:00
parent 861f27018d
commit a891ae41b3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/editors/emacs/generic.nix
View File

@ -67,18 +67,18 @@ in stdenv.mkDerivation {
# Make native compilation work both inside and outside of nix build # Make native compilation work both inside and outside of nix build
(lib.optionalString nativeComp (let (lib.optionalString nativeComp (let
libPath = lib.concatStringsSep ":" [ libPath = (lib.concatStringsSep " "
"${lib.getLib libgccjit}/lib/gcc/${targetPlatform.config}/${libgccjit.version}" (builtins.map (x: ''\"-L${x}\"'') [
"${lib.getLib stdenv.cc.cc}/lib" "${lib.getLib libgccjit}/lib"
"${lib.getLib stdenv.libc}/lib" "${lib.getLib libgccjit}/lib/gcc/${targetPlatform.config}/${libgccjit.version}"
]; "${lib.getLib stdenv.cc.cc}/lib"
"${lib.getLib stdenv.libc}/lib"
]));
in '' in ''
substituteInPlace lisp/emacs-lisp/comp.el --replace \ substituteInPlace lisp/emacs-lisp/comp.el --replace \
"(defcustom comp-async-env-modifier-form nil" \ "(defcustom comp-native-driver-options nil" \
"(defcustom comp-async-env-modifier-form '((setenv \"LIBRARY_PATH\" (string-join (seq-filter (lambda (v) (null (eq v nil))) (list (getenv \"LIBRARY_PATH\") \"${libPath}\")) \":\")))" "(defcustom comp-native-driver-options '(${libPath})"
'')) ''))
"" ""
]; ];