Merge branch 'staging-next-21.05' into staging-21.05

2021-06-25 00:15:49 -07:00
parent 0ad342052e 8112fbe212
commit 5299f12e63
160 changed files with 3797 additions and 2413 deletions
@@ -176,6 +176,8 @@ let
      # default to python's platforms
      platforms = python.meta.platforms;
      isBuildPythonPackage = python.meta.platforms;
+    } // lib.optionalAttrs (attrs?pname) {
+      mainProgram = attrs.pname;
    } // meta;
  } // lib.optionalAttrs (attrs?checkPhase) {
    # If given use the specified checkPhase, otherwise use the setup hook.