diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-17 18:26:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-17 18:26:46 +0100 |
| commit | 0562dbe5d3160b72856bfa7d890ec2caf4073633 (patch) | |
| tree | 56849a825f679cbd2e02ca03e42bbd8f9ff44a45 /guix/derivations.scm | |
| parent | bfb6b1c7b788a5fbcffb089c0df9d254faed4d5b (diff) | |
| parent | 9b43a0ffa3869e56063cd4dea054828e53113c4b (diff) | |
| download | guix-patches-0562dbe5d3160b72856bfa7d890ec2caf4073633.tar guix-patches-0562dbe5d3160b72856bfa7d890ec2caf4073633.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/derivations.scm')
| -rw-r--r-- | guix/derivations.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index b47ab93759..4d11434e3a 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -451,13 +451,13 @@ that form." ;; This procedure is called frequently, so memoize it. (memoize (lambda* (path #:optional (output "out")) - "Read the derivation from PATH (`/nix/store/xxx.drv'), and return the store + "Read the derivation from PATH (`/gnu/store/xxx.drv'), and return the store path of its output OUTPUT." (derivation->output-path (call-with-input-file path read-derivation) output)))) (define (derivation-path->output-paths path) - "Read the derivation from PATH (`/nix/store/xxx.drv'), and return the + "Read the derivation from PATH (`/gnu/store/xxx.drv'), and return the list of name/path pairs of its outputs." (derivation->output-paths (call-with-input-file path read-derivation))) |