alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/tests/installer: Add stdenvNoCC to extraDependencies

Browse source 
The installer tests are failing after 505e94256e
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.
This commit is contained in:
Tuomas Tynkkynen 2017-08-24 01:54:31 +03:00
parent c60cbef91c
commit b471e125c2
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/tests/installer.nix
View file

@ -18,6 +18,9 @@ let
<nixpkgs/nixos/modules/testing/test-instrumentation.nix> <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
]; ];
# To ensure that we can rebuild the grub configuration on the nixos-rebuild
system.extraDependencies = with pkgs; [ stdenvNoCC ];
${optionalString (bootLoader == "grub") '' ${optionalString (bootLoader == "grub") ''
boot.loader.grub.version = ${toString grubVersion}; boot.loader.grub.version = ${toString grubVersion};
${optionalString (grubVersion == 1) '' ${optionalString (grubVersion == 1) ''