From 1ecc97b6bdb27e56d832ca48cdafd3dbb5185a04 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 6 Aug 2011 16:05:24 +0000 Subject: * Add a Nix expression search path feature. Paths between angle brackets, e.g. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit import 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. --- scripts/nix-build.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/nix-build.in') diff --git a/scripts/nix-build.in b/scripts/nix-build.in index f9d81b36c7a0..d9d1da73b12f 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") { -- cgit 1.4.1