diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-05 00:04:05 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-05 00:05:38 +0200 |
| commit | 40d71e44f5068b28f48bd131940260cc0ab2e2d1 (patch) | |
| tree | b7f79803615b3b57d84ea9693d58e183a547e36a | |
| parent | 834a2fc1ff170aa66b8f4d2694b61dac1f43b0ae (diff) | |
| download | guix-40d71e44f5068b28f48bd131940260cc0ab2e2d1.tar.gz | |
profiles: 'profile-derivation' now honors #:system.
Fixes <http://bugs.gnu.org/23682>. Reported by Ander GM <anthk@openmailbox.org>. * guix/profiles.scm (profile-derivation): Pass #:system to 'gexp->derivation'. * tests/guix-environment.sh: Add 'guix environment -s' test.
| -rw-r--r-- | guix/profiles.scm | 1 | ||||
| -rw-r--r-- | tests/guix-environment.sh | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index 8355af7a48..ce8a11fbe5 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -811,6 +811,7 @@ the monadic procedures listed in HOOKS--such as an Info 'dir' file, etc." #:search-paths search-paths))) (gexp->derivation "profile" builder + #:system system #:modules '((guix build profiles) (guix build union) (guix build utils) diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index 5ad8dfa82a..0b5123ab45 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -57,6 +57,21 @@ else test $? = 42 fi +case "`uname -m`" in + x86_64) + # On x86_64, we should be able to create a 32-bit environment. + guix environment --bootstrap --ad-hoc guile-bootstrap --pure \ + -- guile -c '(exit (string-prefix? "x86_64" %host-type))' + guix environment --bootstrap --ad-hoc guile-bootstrap --pure \ + -s i686-linux \ + -- guile -c '(exit (string-prefix? "i686" %host-type))' + ;; + *) + echo "nothing to do" >&2 + ;; +esac + + # Same as above, but with deprecated -E flag. if guix environment --bootstrap --ad-hoc guile-bootstrap --pure \ -E "guile -c '(exit 42)'" |