Merge master into staging-next

2021-05-08 06:20:05 +00:00
parent 01bf147849 2af2325cf7
commit e21fb16f9a
26 changed files with 442 additions and 317 deletions
@@ -14,7 +14,7 @@ let
  mkWith = mkFlag "with-" "without-";
  mkOther = mkFlag "" "" true;

-  shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;

  optPam = shouldUsePkg pam;
  optLibidn = shouldUsePkg libidn;