mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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>
This commit is contained in:
parent
c71b7b5b37
commit
41dfe40f5d
1 changed files with 10 additions and 1 deletions
|
@ -28,6 +28,7 @@ (define-module (guix scripts pack)
|
|||
#: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 @@ (define (build-wrapper program)
|
|||
(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)
|
||||
|
|
Loading…
Reference in a new issue