diff options
Diffstat (limited to 'pkgs/top-level/release-lib.nix')
| -rw-r--r-- | pkgs/top-level/release-lib.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 87fb00a9682d..dbeb13d4bd31 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -98,7 +98,12 @@ rec { packagePlatforms = mapAttrs (name: value: let res = builtins.tryEval ( if isDerivation value then - value.meta.hydraPlatforms or (value.meta.platforms or [ "x86_64-linux" ]) + value.meta.hydraPlatforms or (let + linuxDefaulted = value.meta.platforms or [ "x86_64-linux" ]; + pred = system: lib.any + (lib.meta.platformMatch (lib.systems.elaborate { inherit system; })) + linuxDefaulted; + in lib.filter pred supportedSystems) else if value.recurseForDerivations or false || value.recurseForRelease or false then packagePlatforms value else @@ -108,7 +113,7 @@ rec { /* Common platform groups on which to test packages. */ - inherit (platforms) unix linux darwin cygwin allBut all mesaPlatforms; + inherit (platforms) unix linux darwin cygwin all mesaPlatforms; /* Platform groups for specific kinds of applications. */ x11Supported = linux; |