diff options
| author | Ludovic Courtès <[email protected]> | 2019-09-17 16:17:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2019-09-17 16:27:15 +0200 |
| commit | 9ff87bb99614923fa3336ab4bbf22e3444709b48 (patch) | |
| tree | fa169a6cc0fdc8d92bb4c4a4f265afc2ba29a890 /nix/libstore/builtins.cc | |
| parent | ae71bef532d6b1c9d1481a3ac65827f148b1e45b (diff) | |
| parent | 9e8e252026f558933bdd9cfc26a75d13954b3e8e (diff) | |
Merge branch 'master' into core-updates
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); |