Merge staging-next into staging

2021-01-27 12:24:09 +00:00
parent 8f69090ba5 2137c13b40
commit 1b5da764a7
93 changed files with 461 additions and 238 deletions
@@ -124,7 +124,7 @@ let
      # to avoid cyclic dependencies between Qt modules.
      mkDerivation =
        import ../mkDerivation.nix
-        { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
+        { inherit lib; inherit debug; wrapQtAppsHook = null; }
        stdenvActual.mkDerivation;
    }
    { inherit self srcs patches; };