maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/cli): bundle corepkgs/fetchurl.nix with tvix-cli

Browse source 
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
This commit is contained in:
Vincent Ambo 2023-03-04 03:43:59 +03:00 • committed by tazjin
parent c700776733
commit a59e264457
3 changed files with 76 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tvix/cli/src/main.rs
View file

@ -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));