08/08: pack: Construct inferior package names correctly.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 41dfe40f5dbd162558c3954ae8eb991a56a65682
Author: P.C. Shyamshankar <address@hidden>
Date:   Fri Feb 22 22:38:47 2019 -0500

    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 <address@hidden>
---
 guix/scripts/pack.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index bfb8b85..17a166d 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)