diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-08-06 16:05:24 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-08-06 16:05:24 +0000 |
commit | 1ecc97b6bdb27e56d832ca48cdafd3dbb5185a04 (patch) | |
tree | 4de27ee42f04bb50766f33a58d830677bd8fa80b /scripts | |
parent | 54945a2950174ded83d58336061b4a9990cdbbfd (diff) |
* Add a Nix expression search path feature. Paths between angle
brackets, e.g.
import <nixpkgs/pkgs/lib>
are resolved by looking them up relative to the elements listed in
the search path. This allows us to get rid of hacks like
import "${builtins.getEnv "NIXPKGS_ALL"}/pkgs/lib"
The search path can be specified through the ‘-I’ command-line flag
and through the colon-separated ‘NIX_PATH’ environment variable,
e.g.,
$ nix-build -I /etc/nixos ...
If a file is not found in the search path, an error message is
lazily thrown.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/nix-build.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/nix-build.in b/scripts/nix-build.in index f9d81b36c..d9d1da73b 100644 --- a/scripts/nix-build.in +++ b/scripts/nix-build.in @@ -76,10 +76,10 @@ EOF $outLink = $ARGV[$n]; } - elsif ($arg eq "--attr" or $arg eq "-A") { + elsif ($arg eq "--attr" or $arg eq "-A" or $arg eq "-I") { $n++; die "$0: `$arg' requires an argument\n" unless $n < scalar @ARGV; - push @instArgs, ("--attr", $ARGV[$n]); + push @instArgs, ($arg, $ARGV[$n]); } elsif ($arg eq "--arg" || $arg eq "--argstr") { |