Merge staging-next into staging

2021-01-22 16:56:40 +10:00
parent afc2edc3ee d40c5e1c8f
commit 153ad8bc1e
1772 changed files with 4918 additions and 4917 deletions
@@ -26,7 +26,7 @@
  - libOSMesa is in $osmesa (~4 MB)
 */

-with stdenv.lib;
+with lib;

 let
  # Release calendar: https://www.mesa3d.org/release-calendar.html
@@ -201,7 +201,7 @@ stdenv.mkDerivation {
    done
  '';

-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-fno-common";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-common";

  passthru = {
    inherit libdrm;