Merge branch 'patch-10' of git://github.com/matthewbauer/nixpkgs

This commit is contained in:
Shea Levy 2018-03-08 18:31:55 -05:00
commit c46cd6cefe
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27

View File

@ -45,6 +45,8 @@ rec {
(setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) (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 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))
(setq nixpkgs--is-nixpkgs-buffer t) (setq nixpkgs--is-nixpkgs-buffer t)
(inherit-local 'nixpkgs--is-nixpkgs-buffer) (inherit-local 'nixpkgs--is-nixpkgs-buffer)