Hi, John Kehayias <john.kehay...@protonmail.com> skribis:
> From 72be4a15a10916ae8d51dfb2998d6179bc57be59 Mon Sep 17 00:00:00 2001 > From: John Kehayias <john.kehay...@protonmail.com> > Date: Thu, 3 Nov 2022 14:25:09 -0400 > Subject: [PATCH] shell: Fix '--emulate-fhs' sometimes not including > 'glibc-for-fhs'. > > Fixes <https://issues.guix.gnu.org/58861>. > > Previously the order of the options giving to 'guix shell' could mean that the > 'glibc-for-fhs' package included with the '--emulate-fhs' option would not > appear in the container. For example, using the development option with a > package using the 'gnu-build-system', e.g. 'guix shell -CFD hello', would > include the regular 'glibc' package. The option ordered mattered: 'guix shell > -CD hello -F' would include the expected 'glibc-for-fhs'. We fix this by > having 'glibc-for-fhs' added to the package list just before calling > 'options-with-caching' so the option order given by the user does not matter. > > * guix/scripts/shell.scm (%options): Move the '--emulate-fhs' (expression > . ...) component from here... > (parse-args): ... to here. > * tests/guix-environment-container.sh: Add a test to check that > 'glibc-for-fhs' is in the container even when 'glibc' is included in the 'guix > shell' package list. Perfect; applied, thanks! Ludo’.
