ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pack: Construct inferior package names correctly.

Browse source 
* 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:
P.C. Shyamshankar 2019-02-22 22:38:47 -05:00 committed by Ludovic Courtès
parent c71b7b5b37
commit 41dfe40f5d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
guix/scripts/pack.scm
View file

@ -28,6 +28,7 @@ (define-module (guix scripts pack)
#:use-module (guix store) #:use-module (guix store)
#:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix grafts) #:use-module (guix grafts)
#:autoload (guix inferior) (inferior-package?)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix modules) #:use-module (guix modules)
#:use-module (guix packages) #:use-module (guix packages)
@ -586,7 +587,15 @@ (define (build-wrapper program)
(find-files #$(file-append package "/sbin")) (find-files #$(file-append package "/sbin"))
(find-files #$(file-append package "/libexec"))))))) (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)) build))
(define (map-manifest-entries proc manifest) (define (map-manifest-entries proc manifest)