diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-02-23 14:34:13 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-03-09 18:55:50 +0100 |
| commit | abd0cca2a9ccba4e57fd2cc318139658559979cf (patch) | |
| tree | 1e9104591a0ef98274f4034101f27ecf81b7e5d0 /guix/scripts | |
| parent | 3e9bea7ee30a3425011afb8e2f70b7a8fe6a404b (diff) | |
| download | guix-abd0cca2a9ccba4e57fd2cc318139658559979cf.tar guix-abd0cca2a9ccba4e57fd2cc318139658559979cf.tar.gz | |
perform-download: Allow use of ‘download-nar’ for ‘--check’ builds.
Previously, the nar fallback would always fail on ‘--check’ build
because the output directory in that case is different from the store
file name. This change fixes that.
* guix/build/git.scm (git-fetch-with-fallback): Add #:item parameter and
pass it to ‘download-nar’.
* guix/scripts/perform-download.scm (perform-git-download): Pass #:item
to ‘git-fetch-with-fallback’.
Change-Id: I30fc948718e99574005150bba5215a51ef153c49
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/perform-download.scm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/guix/scripts/perform-download.scm b/guix/scripts/perform-download.scm index e7eb3b2a1f..b96959a09e 100644 --- a/guix/scripts/perform-download.scm +++ b/guix/scripts/perform-download.scm @@ -114,10 +114,13 @@ Note: OUTPUT may differ from the 'out' value of DRV, notably for 'bmCheck' or ;; on ambient authority, hence the PATH value below. (setenv "PATH" "/run/current-system/profile/bin:/bin:/usr/bin") + ;; Note: When doing a '--check' build, DRV-OUTPUT and OUTPUT are + ;; different, hence the #:item argument below. (git-fetch-with-fallback url commit output #:hash hash #:hash-algorithm algo #:recursive? recursive? + #:item (derivation-output-path drv-output) #:git-command %git)))) (define (assert-low-privileges) |