From 9657a4d41b7efd275488613a3c408765b4d55e5b Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 22 Feb 2024 02:06:25 -0800 Subject: [PATCH] Use --replace-warn instead of --replace in substituteInPlace --- overlays/emacs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/overlays/emacs.nix b/overlays/emacs.nix index afe0cc8f4..d1e8a481f 100644 --- a/overlays/emacs.nix +++ b/overlays/emacs.nix @@ -34,8 +34,8 @@ let postPatch = old.postPatch + '' substituteInPlace lisp/loadup.el \ - --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \ - --replace '(emacs-repository-get-branch)' '"master"' + --replace-warn '(emacs-repository-get-version)' '"${repoMeta.rev}"' \ + --replace-warn '(emacs-repository-get-branch)' '"master"' '' + # XXX: Maybe remove when emacsLsp updates to use Emacs # 29. We already have logic in upstream Nixpkgs to use @@ -65,7 +65,7 @@ let "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin" ]))); in '' - substituteInPlace lisp/emacs-lisp/comp.el --replace \ + substituteInPlace lisp/emacs-lisp/comp.el --replace-warn \ "(defcustom comp-libgccjit-reproducer nil" \ "(setq native-comp-driver-options '(${backendPath})) (defcustom comp-libgccjit-reproducer nil"