diff options
| author | Marius Claian <unkn2000@gmail.com> | 2023-04-15 13:06:31 +0300 |
|---|---|---|
| committer | Marius Claian <unkn2000@gmail.com> | 2023-04-15 13:21:57 +0300 |
| commit | 87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61 (patch) | |
| tree | 771cadff8e701e2c8fdc1d6c040a4bb2f7e80791 /overlays | |
| parent | 0dfa16169942b7e524a353b07f8643d57524a6e6 (diff) | |
| download | nixlib-87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61.tar nixlib-87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61.tar.gz nixlib-87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61.tar.bz2 nixlib-87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61.tar.lz nixlib-87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61.tar.xz nixlib-87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61.tar.zst nixlib-87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61.zip | |
Path fixes resulting from libgccjit changes
https://github.com/NixOS/nixpkgs/commit/6c209e862e18d6a9d103a80d5fa2443f4e47163e
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/emacs.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/overlays/emacs.nix b/overlays/emacs.nix index 89a59729b819..e7addc80c354 100644 --- a/overlays/emacs.nix +++ b/overlays/emacs.nix @@ -50,17 +50,20 @@ let # things to get merged into master. (super.lib.optionalString (old ? NATIVE_FULL_AOT) (let backendPath = (super.lib.concatStringsSep " " - (builtins.map (x: ''\"-B${x}\"'') [ + (builtins.map (x: ''\"-B${x}\"'') ([ # Paths necessary so the JIT compiler finds its libraries: "${super.lib.getLib self.libgccjit}/lib" "${super.lib.getLib self.libgccjit}/lib/gcc" "${super.lib.getLib self.stdenv.cc.libc}/lib" + ] ++ super.lib.optionals (self.stdenv.cc?cc.libgcc) [ + "${super.lib.getLib self.stdenv.cc.cc.libgcc}/lib" + ] ++ [ # Executable paths necessary for compilation (ld, as): "${super.lib.getBin self.stdenv.cc.cc}/bin" "${super.lib.getBin self.stdenv.cc.bintools}/bin" "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin" - ])); + ]))); in '' substituteInPlace lisp/emacs-lisp/comp.el --replace \ "(defcustom comp-libgccjit-reproducer nil" \ |