nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2016-06-05 00:04:05 +02:00
parent 834a2fc1ff
commit 40d71e44f5
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
guix/profiles.scm
View File

@ -811,6 +811,7 @@ the monadic procedures listed in HOOKS--such as an Info 'dir' file, etc."
#:search-paths search-paths))) #:search-paths search-paths)))
(gexp->derivation "profile" builder (gexp->derivation "profile" builder
#:system system
#:modules '((guix build profiles) #:modules '((guix build profiles)
(guix build union) (guix build union)
(guix build utils) (guix build utils)

15
tests/guix-environment.sh
View File

@ -57,6 +57,21 @@ else
test $? = 42 test $? = 42
fi 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. # Same as above, but with deprecated -E flag.
if guix environment --bootstrap --ad-hoc guile-bootstrap --pure \ if guix environment --bootstrap --ad-hoc guile-bootstrap --pure \
-E "guile -c '(exit 42)'" -E "guile -c '(exit 42)'"