public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

impure.nix: stringify path from NIX_PATH

Browse Source 
If impure.nix gets the path from NIX_PATH, the type is `path`, and `path+"/."` is a no-op. Stringify it first so `isDir` will return false if it's not, in fact, a dir. This way, single files can be specified with nixpkgs-overlays in the NIX_PATH.
This commit is contained in:
Yorick 2018-05-04 13:12:09 +02:00 committed by GitHub
parent 977f9a129e
commit 20bb5fb0d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/impure.nix
View File

@ -41,7 +41,7 @@ in
# fix-point made by Nixpkgs. # fix-point made by Nixpkgs.
overlays ? let overlays ? let
isDir = path: pathExists (path + "/."); isDir = path: pathExists (path + "/.");
pathOverlays = try <nixpkgs-overlays> ""; pathOverlays = try (toString <nixpkgs-overlays>) "";
homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix"; homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix";
homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays"; homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays";
overlays = path: overlays = path: