diff options
author | Vincent Ambo <mail@tazj.in> | 2023-03-04T00·43+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2023-03-13T20·30+0000 |
commit | a59e264457f030fedf63c6d2925c896d6790d390 (patch) | |
tree | c5036a4f33ff1afde2b0c1fdf412823a66c93b80 /tvix/cli/src/main.rs | |
parent | c7007767336b5c7cc29b1fd10cd62132c99941e6 (diff) |
feat(tvix/cli): bundle corepkgs/fetchurl.nix with tvix-cli r/5981
This file which ships with C++ Nix is required for evaluating nixpkgs. Like C++ Nix, we now inject a pseudo path in EvalIO from which this will resolve as <nix/fetchurl.nix> Change-Id: Ic948c476a2cfc6381d5655d308bc2d5fa25b7123 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8213 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/cli/src/main.rs')
-rw-r--r-- | tvix/cli/src/main.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs index 0942c128ecf7..beac12632422 100644 --- a/tvix/cli/src/main.rs +++ b/tvix/cli/src/main.rs @@ -56,7 +56,15 @@ fn interpret(code: &str, path: Option<PathBuf>, args: &Args, explain: bool) -> b let known_paths: Rc<RefCell<KnownPaths>> = Default::default(); eval.io_handle = Box::new(nix_compat::NixCompatIO::new(known_paths.clone())); - eval.nix_path = args.nix_search_path.clone(); + + // bundle fetchurl.nix (used in nixpkgs) by resolving <nix> to + // `/__corepkgs__`, which has special handling in [`nix_compat`]. + eval.nix_path = args + .nix_search_path + .as_ref() + .map(|p| format!("nix=/__corepkgs__:{}", p)) + .or_else(|| Some("nix=/__corepkgs__".to_string())); + eval.builtins .extend(derivation::derivation_builtins(known_paths)); |