Unverified Commit 8ab9c53e authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #265343 from Artturin/fixeval3

parents e5385e6c 70902269

pkgs/test/cross/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ let 
  compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let

    pkgName = (pkgFun hostPkgs).name;

    args' = lib.concatStringsSep " " args;

  in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" {

  in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.stdenv.hostPlatform.config}" {

    nativeBuildInputs = [ pkgs.dos2unix ];

  } ''

    # Just in case we are using wine, get rid of that annoying extra
@@ -59,12 +59,12 @@ let 
      crossSystem = crossSystemFun system;

    };



    emulator = crossPkgs.hostPlatform.emulator pkgs;

    emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs;



    # Apply some transformation on windows to get dlls in the right

    # place. Unfortunately mingw doesn’t seem to be able to do linking

    # properly.

    platformFun = pkg: if crossPkgs.hostPlatform.isWindows then

    platformFun = pkg: if crossPkgs.stdenv.hostPlatform.isWindows then

      pkgs.buildEnv {

        name = "${pkg.name}-winlinks";

        paths = [pkg] ++ pkg.buildInputs;
@@ -92,7 +92,7 @@ let 
    };



    pkg-config = {platformFun, crossPkgs, emulator}: crossPkgs.runCommand

      "test-pkg-config-${crossPkgs.hostPlatform.config}"

      "test-pkg-config-${crossPkgs.stdenv.hostPlatform.config}"

    {

      depsBuildBuild = [ crossPkgs.pkgsBuildBuild.pkg-config ];

      nativeBuildInputs = [ crossPkgs.pkgsBuildHost.pkg-config crossPkgs.buildPackages.zlib ];

pkgs/test/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ with pkgs; 
      pkgSets = lib.pipe pkgNames [

        (filter (lib.hasPrefix "llvmPackages"))

        (filter (n: n != "rocmPackages.llvm"))

        # Is a throw alias.

        (filter (n: n != "llvmPackages_rocm"))

        (filter (n: n != "llvmPackages_latest"))

        (filter (n: n != "llvmPackages_git"))

      ];