Merge master into staging-next

2021-04-02 18:14:54 +00:00
parent 60739e07d2 9d9a1339b8
commit b3a0328b7f
82 changed files with 2602 additions and 1381 deletions
@@ -41,7 +41,7 @@ common =

      nativeBuildInputs =
        [ pkg-config ]
-        ++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ]
+        ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]
        ++ lib.optionals is24
          [ autoreconfHook
            autoconf-archive