diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-24 01:54:31 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-24 02:07:56 +0300 |
| commit | b471e125c25bda10570a9279c5f817b933987a8a (patch) | |
| tree | 41e58c9fcd705b651e5dfe55b540f833f25d029c /nixos/tests/installer.nix | |
| parent | c60cbef91c78dbd6b33aabe32c4fa8547504055c (diff) | |
| download | nixpkgs-b471e125c25bda10570a9279c5f817b933987a8a.tar nixpkgs-b471e125c25bda10570a9279c5f817b933987a8a.tar.gz nixpkgs-b471e125c25bda10570a9279c5f817b933987a8a.tar.bz2 nixpkgs-b471e125c25bda10570a9279c5f817b933987a8a.tar.lz nixpkgs-b471e125c25bda10570a9279c5f817b933987a8a.tar.xz nixpkgs-b471e125c25bda10570a9279c5f817b933987a8a.tar.zst nixpkgs-b471e125c25bda10570a9279c5f817b933987a8a.zip | |
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.
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d1fc3c85e99..a8090dc62ee 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -18,6 +18,9 @@ let <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") '' boot.loader.grub.version = ${toString grubVersion}; ${optionalString (grubVersion == 1) '' |