diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-07-05 13:35:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-07-05 13:35:21 +0200 |
| commit | 5adb2df0a2584d49f1fde7671c81ba54f7e43d51 (patch) | |
| tree | 3a7a5a92b092d7b318abfda9604a9f8c4ced69ba | |
| parent | 633b6b6197c0b125c68147503deec5e3bdcabc6f (diff) | |
| download | patches-5adb2df0a2584d49f1fde7671c81ba54f7e43d51.tar patches-5adb2df0a2584d49f1fde7671c81ba54f7e43d51.tar.gz | |
pack: Use guile-for-build for the target system.
Until now, running "guix pack -s i686-linux" on an x86_64-linux machine,
for instance, would use an x86_64 guile for module derivations. This
was OK until now, but would break when passing "--localstatedir" due to
the introduction of guile-sqlite3: we'd be using the i686 guile-sqlite3
along with the x86_64 guile.
* guix/scripts/pack.scm (guix-pack): Pass the 'system option from OPTS
to 'package-derivation'.
| -rw-r--r-- | guix/scripts/pack.scm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 7f087a3a3c..6d5d745bc8 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -722,6 +722,7 @@ Create a bundle of PACKAGE.\n")) (if (assoc-ref opts 'bootstrap?) %bootstrap-guile (canonical-package guile-2.2)) + (assoc-ref opts 'system) #:graft? (assoc-ref opts 'graft?)))) (let* ((dry-run? (assoc-ref opts 'dry-run?)) (relocatable? (assoc-ref opts 'relocatable?)) |