ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Throw an error if NIXPKGS_OVERLAYS is invalid and improve documentation.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-12-26 19:26:24 +00:00 committed by Nicolas B. Pierron
parent 6a83c315ec
commit f9da1fa957
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/overlays.xml
View File

@ -13,8 +13,8 @@ to bind the dependencies of all packages.</para>
<section xml:id="sec-overlays-install"> <section xml:id="sec-overlays-install">
<title>Installing Overlays</title> <title>Installing Overlays</title>
<para>Overlays are looked for in the following order, the first valid one is <para>The set of overlays are looked for in the following order, only the
considered, and all the rest are ignored: first one present is considered, and all the rest are ignored:
<orderedlist> <orderedlist>

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

@ -31,7 +31,9 @@
let content = readDir dir; in let content = readDir dir; in
map (n: import "${dir}/${n}") (sort lessThan (attrNames content)); map (n: import "${dir}/${n}") (sort lessThan (attrNames content));
in in
if dirEnv != "" then
if dirCheck dirEnv then overlays dirEnv if dirCheck dirEnv then overlays dirEnv
else throw "The environment variable NIXPKGS_OVERLAYS does not name a valid directory."
else if dirCheck dirHome then overlays dirHome else if dirCheck dirHome then overlays dirHome
else [] else []