diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
| commit | 58ea4d407c2e4adbe51b2d7b71dc8bef095677c7 (patch) | |
| tree | 0fd70c0cb82d7980a7ff82500dec7bfd0d535d3f /nix/libstore/builtins.cc | |
| parent | fcd75bdbfa99d14363b905afbf914eec20e69df8 (diff) | |
| parent | 84b60a7cdfca1421a478894e279104a0c18a7c6d (diff) | |
| download | patches-58ea4d407c2e4adbe51b2d7b71dc8bef095677c7.tar patches-58ea4d407c2e4adbe51b2d7b71dc8bef095677c7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/libstore/builtins.cc')
| -rw-r--r-- | nix/libstore/builtins.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nix/libstore/builtins.cc b/nix/libstore/builtins.cc index 32af767dc4..7ed75e5079 100644 --- a/nix/libstore/builtins.cc +++ b/nix/libstore/builtins.cc @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2016 Ludovic Courtès <ludo@gnu.org> + Copyright (C) 2016, 2017 Ludovic Courtès <ludo@gnu.org> This file is part of GNU Guix. @@ -25,7 +25,8 @@ namespace nix { static void builtinDownload(const Derivation &drv, - const std::string &drvPath) + const std::string &drvPath, + const std::string &output) { /* Invoke 'guix perform-download'. */ Strings args; @@ -35,7 +36,10 @@ static void builtinDownload(const Derivation &drv, /* Close all other file descriptors. */ closeMostFDs(set<int>()); - const char *const argv[] = { "download", drvPath.c_str(), NULL }; + const char *const argv[] = + { + "download", drvPath.c_str(), output.c_str(), NULL + }; /* XXX: Hack our way to use the 'download' script from 'LIBEXECDIR/guix' or just 'LIBEXECDIR', depending on whether we're running uninstalled or |