Unverified Commit 90b8554d authored by Connor Baker's avatar Connor Baker Committed by GitHub
Browse files

tests.stdenv: use system from stdenv.{build,host}Platform (#447555)

parents c86ffae9 d9dbfc0a

pkgs/test/stdenv/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ in 
              "-c"

              ": > $out"

            ];

            system = builtins.currentSystem;

            inherit (stdenv.buildPlatform) system;

          };

          dep2 = derivation {

            name = "dep2";
@@ -288,7 +288,7 @@ in 
              "-c"

              ": > $out"

            ];

            system = builtins.currentSystem;

            inherit (stdenv.buildPlatform) system;

          };

          passAsFile = [ "dep2" ];

        })
@@ -319,7 +319,7 @@ in 
              "-c"

              ": > $out"

            ];

            system = builtins.currentSystem;

            inherit (stdenv.buildPlatform) system;

          };

          dep2 = derivation {

            name = "dep2";
@@ -328,7 +328,7 @@ in 
              "-c"

              ": > $out"

            ];

            system = builtins.currentSystem;

            inherit (stdenv.buildPlatform) system;

          };

          name = "meow";

          outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
@@ -386,7 +386,7 @@ in 
  ensure-no-execve-in-setup-sh =

    derivation {

      name = "ensure-no-execve-in-setup-sh";

      system = stdenv.system;

      inherit (stdenv.hostPlatform) system;

      builder = "${stdenv.bootstrapTools}/bin/bash";

      PATH = "${pkgs.strace}/bin:${stdenv.bootstrapTools}/bin";

      initialPath = [