about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@enlambda.com>2016-12-11T18·31+0100
committerGitHub <noreply@github.com>2016-12-11T18·31+0100
commit05f907787fdc1903af0366d72cf6c30e9835182d (patch)
tree84ccc81349294cbfd525cdceee423f0670008031
parent41d6523ef57c3b35483eeef7cb85eb6c6a84aeb2 (diff)
parentbb5a6c0085a12221849e51568198121157a02f49 (diff)
Merge pull request #1153 from lheckemann/path-search
Document path-searching behaviour
-rw-r--r--doc/manual/expressions/language-values.xml11
-rw-r--r--shell.nix1
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/manual/expressions/language-values.xml b/doc/manual/expressions/language-values.xml
index b90baac5054c..67da688a4fc5 100644
--- a/doc/manual/expressions/language-values.xml
+++ b/doc/manual/expressions/language-values.xml
@@ -167,7 +167,16 @@ stdenv.mkDerivation {
   user's home directory. e.g. <filename>~/foo</filename> would be
   equivalent to <filename>/home/edolstra/foo</filename> for a user
   whose home directory is <filename>/home/edolstra</filename>.
-  </para></listitem>
+  </para>
+
+  <para>Paths can also be specified between angle brackets, e.g.
+  <literal>&lt;nixpkgs&gt;</literal>. This means that the directories
+  listed in the environment variable
+  <envar linkend="env-NIX_PATH">NIX_PATH</envar> will be searched
+  for the given file or directory name.
+  </para>
+
+  </listitem>
 
   <listitem><para><emphasis>Booleans</emphasis> with values
   <literal>true</literal> and
diff --git a/shell.nix b/shell.nix
index 272627692a2d..dd448410554e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
         customMemoryManagement = false;
       })
       autoreconfHook
+      perlPackages.DBDSQLite
     ];
 
   configureFlags =