diff options
| author | Pierre Neidhardt <mail@ambrevar.xyz> | 2020-02-24 13:50:43 +0100 |
|---|---|---|
| committer | Pierre Neidhardt <mail@ambrevar.xyz> | 2020-02-29 10:42:35 +0100 |
| commit | 39fecacaef614871c046a8855af2b4173f7811dd (patch) | |
| tree | f13a2bea54bcad3beeb4d5b900dc84a07f9a33da /nonguix/build-system | |
| parent | 1fde948adee9a15ce68c015b790afad9a8fc3a1b (diff) | |
nonguix: Use the install-plan of the copy-build-system in the binary-build-system.
* 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.
Diffstat (limited to 'nonguix/build-system')
| -rw-r--r-- | nonguix/build-system/binary.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nonguix/build-system/binary.scm b/nonguix/build-system/binary.scm index 2c2bae6..2ec1261 100644 --- a/nonguix/build-system/binary.scm +++ b/nonguix/build-system/binary.scm @@ -23,6 +23,7 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) + #:use-module (guix build-system copy) #:use-module (guix packages) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -37,7 +38,7 @@ ;; Commentary: ;; ;; Standard build procedure for binary packages. This is implemented as an -;; extension of `gnu-build-system'. +;; extension of `copy-build-system'. ;; ;; Code: @@ -45,7 +46,7 @@ ;; Build-side modules imported by default. `((nonguix build binary-build-system) (nonguix build utils) - ,@%gnu-build-system-modules)) + ,@%copy-build-system-modules)) (define (default-patchelf) "Return the default patchelf package." @@ -78,7 +79,6 @@ `(("source" ,source)) '()) ,@inputs - ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) (build-inputs `(("patchelf" ,patchelf) @@ -94,7 +94,7 @@ #:key (guile #f) (outputs '("out")) (patchelf-plan ''()) - (install-plan ''(("." (".") "./"))) + (install-plan ''(("." "./"))) (search-paths '()) (out-of-source? #t) (validate-runpath? #t) |