diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 5334498d0844..d83c15c511fa 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,18 +1,23 @@ { # The pkgs used for dependencies for the testing itself # Don't test properties of pkgs.lib, but rather the lib in the parent directory pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }, + # For testing someone may edit impure.nix to return cross pkgs, use `pkgsBuildBuild` directly so everything here works. + pkgsBB ? pkgs.pkgsBuildBuild, nix ? pkgs-nixVersions.stable, nixVersions ? [ pkgs-nixVersions.minimum nix pkgs-nixVersions.latest ], - pkgs-nixVersions ? import ./nix-for-tests.nix { inherit pkgs; }, + pkgs-nixVersions ? import ./nix-for-tests.nix { pkgs = pkgsBB; }, }: let lib = import ../.; testWithNix = nix: - import ./test-with-nix.nix { inherit lib nix pkgs; }; + import ./test-with-nix.nix { + inherit lib nix; + pkgs = pkgsBB; + }; in - pkgs.symlinkJoin { + pkgsBB.symlinkJoin { name = "nixpkgs-lib-tests"; paths = map testWithNix nixVersions; }