about summary refs log tree commit diff
path: root/pkgs/stdenv/generic/check-meta.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-03-19 18:03:46 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-03-19 19:29:16 -0400
commite547bd0dc419cdbe2e8d8440224b252f723590ab (patch)
tree56bcf02f80daba865e1aa7e5c9cf9b65ad21a62d /pkgs/stdenv/generic/check-meta.nix
parenteae19f3c28503a8623b0fee10bfb0b3322122637 (diff)
downloadnixlib-e547bd0dc419cdbe2e8d8440224b252f723590ab.tar
nixlib-e547bd0dc419cdbe2e8d8440224b252f723590ab.tar.gz
nixlib-e547bd0dc419cdbe2e8d8440224b252f723590ab.tar.bz2
nixlib-e547bd0dc419cdbe2e8d8440224b252f723590ab.tar.lz
nixlib-e547bd0dc419cdbe2e8d8440224b252f723590ab.tar.xz
nixlib-e547bd0dc419cdbe2e8d8440224b252f723590ab.tar.zst
nixlib-e547bd0dc419cdbe2e8d8440224b252f723590ab.zip
lib: Factor in tiny bit of `meta.platform` checking
I need it in stdenv and release-lib, so that seems motivation enough.
Diffstat (limited to 'pkgs/stdenv/generic/check-meta.nix')
-rw-r--r--pkgs/stdenv/generic/check-meta.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 444bad84d8d0..6a8d97458e56 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -173,10 +173,8 @@ let
     else "key '${k}' is unrecognized; expected one of: \n\t      [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
   checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
 
-  checkPlatform = attrs: let
-      raw = attrs.meta.platforms;
-      uniform = map (x: if builtins.isString x then { system = x; } else { parsed = x; }) raw;
-    in lib.any (pat: lib.matchAttrs pat hostPlatform) uniform;
+  checkPlatform = attrs:
+    lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms;
 
   # Check if a derivation is valid, that is whether it passes checks for
   # e.g brokenness or license.