Unverified Commit 305d1e38 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #227119 from alyssais/same-triple 

Avoid same-triple cross in tests
parents 7ddf6698 4025014f

pkgs/os-specific/linux/systemd/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ stdenv.mkDerivation (finalAttrs: { 


    tests = {

      inherit (nixosTests) switchTest;

      cross = pkgsCross.aarch64-multiplatform.systemd;

      cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.systemd;

    };

  };

pkgs/test/make-binary-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ let 
    "prefix"

    "suffix"

  ] makeGoldenTest // lib.optionalAttrs (! stdenv.isDarwin) {

    cross = pkgsCross.aarch64-multiplatform.callPackage ./cross.nix { };

    cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.callPackage ./cross.nix { };

  };

in