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

Merge pull request #451 from LnL7/eval-no-nixpkgs

Browse source 
rename nixpkgs entry in NIX_PATH
This commit is contained in:
Graham Christensen 2020-04-05 15:06:55 -04:00 committed by GitHub
parent b55535a608 f6c22bfc4f
commit e26497e49d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 where
S: AsRef<OsStr>, S: AsRef<OsStr>,
{ {
let nixpkgspath = format!("nixpkgs={}", nixpkgs.display()); let nixpkgspath = format!("ofborg-nixpkgs-pr={}", nixpkgs.display());
let mut nixpath: Vec<String> = safe_paths let mut nixpath: Vec<String> = safe_paths
.iter() .iter()
.map(|path| format!("{}", path.display())) .map(|path| format!("{}", path.display()))
@ -577,7 +577,7 @@ mod tests {
Expect::Pass, Expect::Pass,
vec![ vec![
"HOME=/homeless-shelter", "HOME=/homeless-shelter",
"NIX_PATH=nixpkgs=", "NIX_PATH=ofborg-nixpkgs-pr=",
"NIX_REMOTE=", "NIX_REMOTE=",
"PATH=", "PATH=",
], ],
@ -604,7 +604,7 @@ mod tests {
Expect::Pass, Expect::Pass,
vec![ vec![
"HOME=/homeless-shelter", "HOME=/homeless-shelter",
"NIX_PATH=nixpkgs=", "NIX_PATH=ofborg-nixpkgs-pr=",
"NIX_REMOTE=", "NIX_REMOTE=",
"PATH=", "PATH=",
"GC_INITIAL_HEAP_SIZE=4g", "GC_INITIAL_HEAP_SIZE=4g",