nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-12-04 04:33:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5244 from edolstra/fix-mac-build

Browse Source 
Fix macOS build
This commit is contained in:
Eelco Dolstra 2021-09-14 10:42:09 +02:00 committed by GitHub
commit 9bfdd556cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libfetchers/git.cc
View File

@ -413,7 +413,7 @@ struct GitInputScheme : InputScheme
AutoDelete delTmpDir(tmpDir, true); AutoDelete delTmpDir(tmpDir, true);
PathFilter filter = defaultPathFilter; PathFilter filter = defaultPathFilter;
auto result = runProgram({ auto result = runProgram(RunOptions {
.program = "git", .program = "git",
.args = { "-C", repoDir, "cat-file", "commit", input.getRev()->gitRev() }, .args = { "-C", repoDir, "cat-file", "commit", input.getRev()->gitRev() },
.mergeStderrToStdout = true .mergeStderrToStdout = true

2
src/libstore/build/local-derivation-goal.cc
View File

@ -66,7 +66,7 @@ void handleDiffHook(
auto diffHook = settings.diffHook; auto diffHook = settings.diffHook;
if (diffHook != "" && settings.runDiffHook) { if (diffHook != "" && settings.runDiffHook) {
try { try {
auto diffRes = runProgram({ auto diffRes = runProgram(RunOptions {
.program = diffHook, .program = diffHook,
.searchPath = true, .searchPath = true,
.args = {tryA, tryB, drvPath, tmpDir}, .args = {tryA, tryB, drvPath, tmpDir},

2
src/libutil/util.cc
View File

@ -1037,7 +1037,7 @@ std::vector<char *> stringsToCharPtrs(const Strings & ss)
string runProgram(Path program, bool searchPath, const Strings & args, string runProgram(Path program, bool searchPath, const Strings & args,
const std::optional<std::string> & input) const std::optional<std::string> & input)
{ {
auto res = runProgram({.program = program, .searchPath = searchPath, .args = args, .input = input}); auto res = runProgram(RunOptions {.program = program, .searchPath = searchPath, .args = args, .input = input});
if (!statusOk(res.first)) if (!statusOk(res.first))
throw ExecError(res.first, fmt("program '%1%' %2%", program, statusToString(res.first))); throw ExecError(res.first, fmt("program '%1%' %2%", program, statusToString(res.first)));

2
src/nix/repl.cc
View File

@ -111,7 +111,7 @@ string runNix(Path program, const Strings & args,
auto subprocessEnv = getEnv(); auto subprocessEnv = getEnv();
subprocessEnv["NIX_CONFIG"] = globalConfig.toKeyValue(); subprocessEnv["NIX_CONFIG"] = globalConfig.toKeyValue();
auto res = runProgram({ auto res = runProgram(RunOptions {
.program = settings.nixBinDir+ "/" + program, .program = settings.nixBinDir+ "/" + program,
.args = args, .args = args,
.environment = subprocessEnv, .environment = subprocessEnv,