From 0f59a83e3bf1a67a7901f9f87c8b9b4affa620dd Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 27 Sep 2026 18:10:00 +0800 Subject: [PATCH] Revert "emacs/wrapper.nix: expose extra package binaries via PATH" This reverts commit 7bd6dfde2feeb6d8472eb36f87c549b791665e38. The idea of using PATH to provide binaries added via withPackages is good, but I think this specific implementation can be improved: - When PATH is used, there is no need to modify exec-path any more because exec-path is initialized from PATH. - Setting PATH in wrapper.sh, together with other environment variables, is more maintainable. --- pkgs/applications/editors/emacs/build-support/wrapper.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix index 051e5923d6b0..782fa7681974 100644 --- a/pkgs/applications/editors/emacs/build-support/wrapper.nix +++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix @@ -174,13 +174,6 @@ runCommand (lib.appendToName "with-packages" emacs).name ;; "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh ;; "$out/share/emacs/native-lisp" is added to native-comp-eln-load-path in wrapper.sh (add-to-list 'exec-path "$out/bin") - ;; Also expose extra package binaries via PATH so that subprocesses - ;; which rebuild their environment from PATH (e.g. direnv/envrc) can - ;; still find them. See https://github.com/purcell/envrc/issues/9 - (let ((deps-bin "$out/bin") - (current-path (or (getenv "PATH") ""))) - (unless (member deps-bin (split-string current-path path-separator)) - (setenv "PATH" (concat deps-bin path-separator current-path)))) ${lib.optionalString withTreeSitter '' (add-to-list 'treesit-extra-load-path "$out/lib/") ''}