Merge staging-next into staging

2021-05-14 16:32:43 +10:00
parent 76c58493d7 bfb5f4cc5e
commit 004f8cd986
100 changed files with 2454 additions and 2943 deletions
@@ -4,7 +4,7 @@
 , unwrapped
 # If it's a minimal build, we don't want to wrap it with lndir and
 # wrapProgram..
-, wrap ? true
+, doWrap ? true
 # For the wrapper
 , makeWrapper
 # For lndir
@@ -138,7 +138,7 @@ let
    ;
    pkgs = packages;
  };
-  self = if wrap then
+  self = if doWrap then
    stdenv.mkDerivation {
      inherit name passthru;
      buildInputs = [