amaharaneko/nonguix-mirrors
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2025-10-02 02:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nonguix: Use the install-plan of the copy-build-system in the binary-build-system.

Browse source 
* nonguix/build-system/binary.scm (lower): Adapt the default value of the
  install plan.
* nonguix/build/binary-build-system.scm (new-install): New procedure.
(old-install): Rename former `install' procedure to this.
(install): New procedure that dispatches over old-install and new-install.
This commit is contained in:
Pierre Neidhardt 2020-02-24 13:50:43 +01:00
parent 1fde948ade
commit 39fecacaef
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
nonguix/build/binary-build-system.scm
View file

@ -30,7 +30,11 @@
;;
;; Code:
(define* (install #:key install-plan outputs #:allow-other-keys)
(define (new-install)
"Return the copy-build-system `install' procedure."
(@@ (guix build copy-build-system) install))
(define* (old-install #:key install-plan outputs #:allow-other-keys)
"Copy files from the \"source\" build input to the \"out\" output according to INSTALL-PLAN.
An INSTALL-PLAN is made of three elements:
@ -70,6 +74,18 @@ represent the target full path, which only makes sense for single files."
(for-each install install-plan)
#t)
(define* (install #:key install-plan outputs #:allow-other-keys)
(define (install-old-format)
(warn "Install-plan format deprecated.
Please update to the format of the copy-build-system.")
(old-install #:install-plan install-plan #:outputs outputs))
(match (car install-plan)
((source (. matches) target)
(install-old-format))
((source #f target)
(install-old-format))
(_ ((new-install) #:install-plan install-plan #:outputs outputs))))
(define* (patchelf #:key inputs outputs patchelf-plan #:allow-other-keys)
"Set the interpreter and the RPATH of files as per the PATCHELF-PLAN.
@ -132,7 +148,7 @@ The inputs are optional when the file is an executable."
(replace 'install install)))
(define* (binary-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args)
#:allow-other-keys #:rest args)
"Build the given package, applying all of PHASES in order."
(apply gnu:gnu-build #:inputs inputs #:phases phases args))