From 70902269fdc4cc8e24e6df1fd58e0672c2d930e7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 4 Nov 2023 00:32:06 +0200 Subject: tests: fix eval failures --- pkgs/test/cross/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/test/cross') diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index b13c41a190533..f844fc2b8ec55 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -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 ]; -- cgit 1.4.1