diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-03 21:59:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-08 11:49:24 +0200 |
| commit | 9fcc35c51fd579b3bb7b4f61cba6973675c3922c (patch) | |
| tree | 51dcf3d81a20f2cc3330d329ccf4f8537d203578 /nix/libstore | |
| parent | 0c684b7edfacada4f576855dbb09291f04a84fa2 (diff) | |
| download | patches-9fcc35c51fd579b3bb7b4f61cba6973675c3922c.tar patches-9fcc35c51fd579b3bb7b4f61cba6973675c3922c.tar.gz | |
daemon: Run 'guix perform-download' directly.
* nix/scripts/download.in: Remove.
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove 'scripts/download'.
* config-daemon.ac: Don't output 'nix/scripts/download'.
* nix/libstore/builtins.cc (builtinDownload): Invoke 'guix
perform-download' directly.
Diffstat (limited to 'nix/libstore')
| -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); |