This patch should resolve the issues we're having with the container
tests when building Guix with Guix.  Tested on 'wip-container' with
'guix environment --container'.