diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-09-18 11:54:54 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-09-18 11:54:54 +0200 |
| commit | 993a4fbb7c3d1f9977e0789c21905fddd72241fd (patch) | |
| tree | 899b928672607b9ad74dafd42eb2bfa048a041c4 /nix/libstore/builtins.cc | |
| parent | 248965c91caf7d10433f090b4712a9b201968416 (diff) | |
| parent | 7bc46ecc34ceb042ff890e5d306d0a2a736e891d (diff) | |
| download | patches-993a4fbb7c3d1f9977e0789c21905fddd72241fd.tar patches-993a4fbb7c3d1f9977e0789c21905fddd72241fd.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip-texlive
Diffstat (limited to 'nix/libstore/builtins.cc')
| -rw-r--r-- | nix/libstore/builtins.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/libstore/builtins.cc b/nix/libstore/builtins.cc index f7c7d42484..4111ac4760 100644 --- a/nix/libstore/builtins.cc +++ b/nix/libstore/builtins.cc @@ -39,7 +39,7 @@ static void builtinDownload(const Derivation &drv, const char *const argv[] = { - "download", drvPath.c_str(), output.c_str(), NULL + "guix", "perform-download", drvPath.c_str(), output.c_str(), NULL }; /* Tell the script what the store file name is, so that @@ -50,7 +50,7 @@ static void builtinDownload(const Derivation &drv, /* Tell it about options such as "print-extended-build-trace". */ setenv("_NIX_OPTIONS", settings.pack().c_str(), 1); - const string program = settings.nixLibexecDir + "/download"; + const string program = settings.guixProgram; execv(program.c_str(), (char *const *) argv); throw SysError(format("failed to run download program '%1%'") % program); |