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
@@ -88,7 +88,7 @@
        systemd
        util-linux
      ] ++ lib.optional enableRDW networkmanager
-        ++ lib.optional (lib.any (lib.meta.platformMatch stdenv.hostPlatform) x86_energy_perf_policy.meta.platforms) x86_energy_perf_policy
+        ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform x86_energy_perf_policy) x86_energy_perf_policy
    );
  in
    ''