diff options
| author | P.C. Shyamshankar <shyam@sykloid.org> | 2019-02-22 22:38:47 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-03-15 23:27:59 +0100 |
| commit | 41dfe40f5dbd162558c3954ae8eb991a56a65682 (patch) | |
| tree | b26c2cb7c89c11330557cd01d87a52b86c0702c4 | |
| parent | c71b7b5b3740177f0df6d3565dcc356ceda1acba (diff) | |
| download | guix-41dfe40f5dbd162558c3954ae8eb991a56a65682.tar guix-41dfe40f5dbd162558c3954ae8eb991a56a65682.tar.gz | |
pack: Construct inferior package names correctly.
* guix/scripts/pack.scm (wrapped-package): now correctly constructs full
names of inferior packages.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | guix/scripts/pack.scm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index bfb8b85356..17a166d9d7 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -28,6 +28,7 @@ #:use-module (guix store) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module (guix grafts) + #:autoload (guix inferior) (inferior-package?) #:use-module (guix monads) #:use-module (guix modules) #:use-module (guix packages) @@ -586,7 +587,15 @@ please email '~a'~%") (find-files #$(file-append package "/sbin")) (find-files #$(file-append package "/libexec"))))))) - (computed-file (string-append (package-full-name package "-") "R") + (computed-file (string-append + (cond ((package? package) + (package-full-name package "-")) + ((inferior-package? package) + (string-append (inferior-package-name package) + "-" + (inferior-package-version package))) + (else "wrapper")) + "R") build)) (define (map-manifest-entries proc manifest) |