mirrors/emacs-overlay
1
Fork 0
mirror of https://github.com/nix-community/emacs-overlay.git synced 2025-12-06 02:40:25 -08:00
Code Issues Projects Releases Wiki Activity

Reapply "Use --replace-warn instead of --replace in substituteInPlace"

Browse source 
This reverts commit 0a9f220646.

--replace-warn is in 24.05.
This commit is contained in:
Brian Leung 2024-08-07 03:01:04 -07:00 • committed by adisbladis
parent 2933ca78e4
commit e417bd7c85
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
overlays/emacs.nix
View file

@ -34,8 +34,8 @@ let
postPatch = old.postPatch + '' postPatch = old.postPatch + ''
substituteInPlace lisp/loadup.el \ substituteInPlace lisp/loadup.el \
--replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \ --replace-warn '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
--replace '(emacs-repository-get-branch)' '"master"' --replace-warn '(emacs-repository-get-branch)' '"master"'
'' + '' +
# XXX: Maybe remove when emacsLsp updates to use Emacs # XXX: Maybe remove when emacsLsp updates to use Emacs
# 29. We already have logic in upstream Nixpkgs to use # 29. We already have logic in upstream Nixpkgs to use
@ -65,7 +65,7 @@ let
"${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin" "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin"
]))); ])));
in '' in ''
substituteInPlace lisp/emacs-lisp/comp.el --replace \ substituteInPlace lisp/emacs-lisp/comp.el --replace-warn \
"(defcustom comp-libgccjit-reproducer nil" \ "(defcustom comp-libgccjit-reproducer nil" \
"(setq native-comp-driver-options '(${backendPath})) "(setq native-comp-driver-options '(${backendPath}))
(defcustom comp-libgccjit-reproducer nil" (defcustom comp-libgccjit-reproducer nil"