Merge branch 'fix-aarch64-test' of https://github.com/grahamc/nix

This commit is contained in:
Eelco Dolstra 2018-02-07 14:12:15 +01:00
commit 0f3dae1064
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -224,7 +224,9 @@ let
nix = build.x86_64-linux; system = "x86_64-linux";
});
tests.setuid = pkgs.lib.genAttrs (pkgs.lib.filter (pkgs.lib.hasSuffix "-linux") systems) (system:
tests.setuid = pkgs.lib.genAttrs
(pkgs.lib.filter (system: system == "x86_64-linux" || system == "i686-linux") systems)
(system:
import ./tests/setuid.nix rec {
inherit nixpkgs;
nix = build.${system}; inherit system;