Skip to content

Commit 6e422a0

Browse files
Artturinroberth
authored andcommitted
tests.stdenv.outputs-no-out: cause less rebuilds
now gcc isn't built
1 parent c8b7048 commit 6e422a0

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

pkgs/test/stdenv/default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
{ stdenv
55
, pkgs
66
, lib
7-
, runCommand
87
, testers
98
}:
109

1110
let
1211
# early enough not to rebuild gcc but late enough to have patchelf
1312
earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages;
13+
earlierPkgs = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages;
1414
# use a early stdenv so when hacking on stdenv this test can be run quickly
1515
bootStdenv = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
1616
pkgsStructured = import pkgs.path { config = { structuredAttrsByDefault = true; }; inherit (stdenv.hostPlatform) system; };
1717
bootStdenvStructuredAttrsByDefault = pkgsStructured.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv;
1818

19+
runCommand = earlierPkgs.runCommand;
20+
1921

2022
ccWrapperSubstitutionsTest = { name, stdenv', extraAttrs ? { } }:
2123

@@ -101,7 +103,7 @@ in
101103
hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; });
102104

103105
outputs-no-out = runCommand "outputs-no-out-assert" {
104-
result = testers.testBuildFailure (stdenv.mkDerivation {
106+
result = earlierPkgs.testers.testBuildFailure (bootStdenv.mkDerivation {
105107
NIX_DEBUG = 1;
106108
name = "outputs-no-out";
107109
outputs = ["foo"];

0 commit comments

Comments
 (0)