the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

rename nixpkgs entry in NIX_PATH

Browse source 
This ensures the local sources are still allowed in restricted mode, but
referencing <nixpkgs> in expressions inside nixpkgs is not.
This commit is contained in:
Daiderd Jordan 2020-04-05 20:03:54 +02:00
parent b55535a608
commit f6c22bfc4f
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ofborg/src/nix.rs
View file

@ -298,7 +298,7 @@ impl Nix {
where
S: AsRef<OsStr>,
{
let nixpkgspath = format!("nixpkgs={}", nixpkgs.display());
let nixpkgspath = format!("ofborg-nixpkgs-pr={}", nixpkgs.display());
let mut nixpath: Vec<String> = safe_paths
.iter()
.map(|path| format!("{}", path.display()))
@ -577,7 +577,7 @@ mod tests {
Expect::Pass,
vec![
"HOME=/homeless-shelter",
"NIX_PATH=nixpkgs=",
"NIX_PATH=ofborg-nixpkgs-pr=",
"NIX_REMOTE=",
"PATH=",
],
@ -604,7 +604,7 @@ mod tests {
Expect::Pass,
vec![
"HOME=/homeless-shelter",
"NIX_PATH=nixpkgs=",
"NIX_PATH=ofborg-nixpkgs-pr=",
"NIX_REMOTE=",
"PATH=",
"GC_INITIAL_HEAP_SIZE=4g",