diff options
| author | Pierre Neidhardt <mail@ambrevar.xyz> | 2020-05-07 14:25:51 +0200 |
|---|---|---|
| committer | Pierre Neidhardt <mail@ambrevar.xyz> | 2020-05-21 11:53:06 +0200 |
| commit | c3f1f09586967c3fefbb280014a4d46b57786696 (patch) | |
| tree | df9bec7343c29a2305390a8339ee91bcb137f1fe /guix/build-system | |
| parent | a0828560b58f6b6c8b400caf0ceee396abc7d4c0 (diff) | |
| download | gnu-guix-c3f1f09586967c3fefbb280014a4d46b57786696.tar gnu-guix-c3f1f09586967c3fefbb280014a4d46b57786696.tar.gz | |
build: asdf-build-system: Use SBCL source in CL packages.
* guix/build/asdf-build-system.scm (copy-files-to-output): Don't attempt to
reset timestamps on files without write access.
(install): When parent SBCL package is in the inputs, use its source. This
way we get possibly patched sources in CL packages as well (e.g. for FFI).
This is also useful for sources that generate files on load-op, like cl-unicode.
* guix/build-system/asdf.scm (package-with-build-system): Forward the SBCL
parent as a native input so that it can be used in the above install phase.
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/asdf.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index f794bf006b..630b99e2bf 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -230,7 +230,10 @@ set up using CL source package conventions." ((#:phases phases) (list phases-transformer phases)))) (inputs (new-inputs package-inputs)) (propagated-inputs (new-propagated-inputs)) - (native-inputs (new-inputs package-native-inputs)) + (native-inputs (append (if target-is-source? + (list (list (package-name pkg) pkg)) + '()) + (new-inputs package-native-inputs))) (outputs (if target-is-source? '("out") (package-outputs pkg))))) |