Merge staging-next into staging

pkgs/development/libraries/libepoxy/default.nix

@@ -8,6 +8,8 @@
 , python3
 , libGL
 , libX11
+, Carbon
+, OpenGL
 }:
 
 let
@@ -38,7 +40,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ];
 
-  buildInputs = [ libGL libX11 ];
+  buildInputs = [
+    libGL
+    libX11
+  ] ++ lib.optionals stdenv.isDarwin [
+    Carbon
+    OpenGL
+  ];
 
   mesonFlags = [
     "-Dtests=${if doCheck then "true" else "false"}"

pkgs/top-level/all-packages.nix

@@ -16142,7 +16142,9 @@ with pkgs;
 
   entt = callPackage ../development/libraries/entt { };
 
-  libepoxy = callPackage ../development/libraries/libepoxy {};
+  libepoxy = callPackage ../development/libraries/libepoxy {
+    inherit (darwin.apple_sdk.frameworks) Carbon OpenGL;
+  };
 
   libesmtp = callPackage ../development/libraries/libesmtp { };