amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: Run 'guix perform-download' directly.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2019-09-03 21:59:45 +02:00
parent 0c684b7edf
commit 9fcc35c51f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nix/libstore/builtins.cc
View file

@ -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);