about summary refs log tree commit diff
path: root/overlays
diff options
context:
space:
mode:
authorBrian Leung <leungbk@posteo.net>2023-04-10 15:18:46 -0700
committerBrian Leung <leungbk@posteo.net>2023-04-10 15:18:46 -0700
commit644ae3ce05ae9d42232bba9642d4eaa63bb062d3 (patch)
tree8cabf6c1250cea1160b60948237894886989c80a /overlays
parentf73f92e01b6477dd56a628e251d265ee999f1afe (diff)
downloadnixlib-644ae3ce05ae9d42232bba9642d4eaa63bb062d3.tar
nixlib-644ae3ce05ae9d42232bba9642d4eaa63bb062d3.tar.gz
nixlib-644ae3ce05ae9d42232bba9642d4eaa63bb062d3.tar.bz2
nixlib-644ae3ce05ae9d42232bba9642d4eaa63bb062d3.tar.lz
nixlib-644ae3ce05ae9d42232bba9642d4eaa63bb062d3.tar.xz
nixlib-644ae3ce05ae9d42232bba9642d4eaa63bb062d3.tar.zst
nixlib-644ae3ce05ae9d42232bba9642d4eaa63bb062d3.zip
Fix comment
Diffstat (limited to 'overlays')
-rw-r--r--overlays/emacs.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 0f3f0a02cfa6..fbbd32aef619 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -37,11 +37,17 @@ let
                 --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
                 --replace '(emacs-repository-get-branch)' '"master"'
               '' +
-              # XXX: Remove when emacsLsp updates to use Emacs 29.  We
-              # already have logic in upstream Nixpkgs to use a
-              # different patch for earlier major versions of Emacs,
+              # XXX: Maybe remove when emacsLsp updates to use Emacs
+              # 29.  We already have logic in upstream Nixpkgs to use
+              # a different patch for earlier major versions of Emacs,
               # but the major version for emacsLsp follows the format
-              # of version YYYYMMDD, as opposed to version (say) 29
+              # of version YYYYMMDD, as opposed to version (say) 29.
+              # Removing this here would also require that we don't
+              # overwrite the patches attribute in the overlay to an
+              # empty list since we would then expect the Nixpkgs
+              # patch to be used. Not sure if it's better to rely on
+              # upstream Nixpkgs since it's cumbersome to wait for
+              # things to get merged into master.
                 (super.lib.optionalString (old ? NATIVE_FULL_AOT)
                     (let backendPath = (super.lib.concatStringsSep " "
                       (builtins.map (x: ''\"-B${x}\"'') [