diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/pkgs/build-support/emacs | |
parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/build-support/emacs')
-rw-r--r-- | nixpkgs/pkgs/build-support/emacs/buffer.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/build-support/emacs/buffer.nix b/nixpkgs/pkgs/build-support/emacs/buffer.nix index b8bd4584e322..48a7996916e8 100644 --- a/nixpkgs/pkgs/build-support/emacs/buffer.nix +++ b/nixpkgs/pkgs/build-support/emacs/buffer.nix @@ -15,16 +15,16 @@ rec { (when (eq nixpkgs--buffer-count 0) (make-variable-buffer-local 'nixpkgs--is-nixpkgs-buffer) ; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer - (defun nixpkgs--around-generate (orig name) + (defun nixpkgs--around-generate (orig name &optional ibh) (if (and nixpkgs--is-nixpkgs-buffer (eq (aref name 0) ?\s)) - (let ((buf (funcall orig name))) + (let ((buf (funcall orig name ibh))) (progn (inherit-local-inherit-child buf) (with-current-buffer buf (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t))) buf) - (funcall orig name))) + (funcall orig name ibh))) (advice-add 'generate-new-buffer :around #'nixpkgs--around-generate) ; When we have no more nixpkgs buffers, tear down the buffer handling (defun nixpkgs--decrement-buffer-count () @@ -45,7 +45,7 @@ rec { (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) - (inherit-local-permanent eshell-path-env (concat "${lib.makeSearchPath "bin" pkgs}:" eshell-path-env)) + (inherit-local-permanent eshell-path-env (concat "${lib.makeSearchPath "bin" pkgs}:" (if (boundp 'eshell-path-env) eshell-path-env (getenv "PATH")))) (setq nixpkgs--is-nixpkgs-buffer t) (inherit-local 'nixpkgs--is-nixpkgs-buffer) |