diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-10-30 19:09:32 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-10-30 22:09:32 +0100 |
| commit | d0dc4907d6dac82ba482472845e83d7411c74ed5 (patch) | |
| tree | cb3e79cef81064604028a86b6453e713198dae3a /guix/derivations.scm | |
| parent | d595e456c1555de5a4ffdbcd7cf99e07b06e2a4f (diff) | |
| download | guix-patches-d0dc4907d6dac82ba482472845e83d7411c74ed5.tar guix-patches-d0dc4907d6dac82ba482472845e83d7411c74ed5.tar.gz | |
derivations: 'derivation-path->output-path' honors the 'output' parameter.
* guix/derivations.scm (derivation-path->output-path): Pass OUTPUT.
* tests/derivations.scm ("multiple-output derivation,
derivation-path->output-path"): New test.
Diffstat (limited to 'guix/derivations.scm')
| -rw-r--r-- | guix/derivations.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index 433a8f145e..48e9d5ec05 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -441,7 +441,8 @@ that form." (lambda* (path #:optional (output "out")) "Read the derivation from PATH (`/nix/store/xxx.drv'), and return the store path of its output OUTPUT." - (derivation->output-path (call-with-input-file path read-derivation))))) + (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 |