From b471e125c25bda10570a9279c5f817b933987a8a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 24 Aug 2017 01:54:31 +0300 Subject: [PATCH] nixos/tests/installer: Add stdenvNoCC to extraDependencies The installer tests are failing after 505e94256ef247dc54250 due to `nixos-rebuild switch` in the installed system trying to build stdenvNoCC. Seems that previously, stdenvNoCC wasn't in the installed system either, but all the direct dependencies for the build were (I don't really understand why, for that matter), so the building actually went fine and everything worked. But now gcc is also a direct build dependency due to allowedRequisites containing gcc (even though it doesn't become a runtime dependency) which doesn't get to the installed system. All in all, let's ensure stdenvNoCC actually gets to the installed system. It's after all necessary in almost any NixOS config build. --- nixos/tests/installer.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d1fc3c85e99a..a8090dc62eec 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -18,6 +18,9 @@ let ]; + # To ensure that we can rebuild the grub configuration on the nixos-rebuild + system.extraDependencies = with pkgs; [ stdenvNoCC ]; + ${optionalString (bootLoader == "grub") '' boot.loader.grub.version = ${toString grubVersion}; ${optionalString (grubVersion == 1) ''