diff --git a/pkgs/development/libraries/mesa/headers.nix b/pkgs/development/libraries/mesa/headers.nix
new file mode 100644
index 000000000000..314e1ac5efad
--- /dev/null
+++ b/pkgs/development/libraries/mesa/headers.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+}:
+
+let
+  common = import ./common.nix { inherit lib fetchFromGitLab; };
+  headers = [
+    "include/EGL/eglext_angle.h"
+    "include/EGL/eglmesaext.h"
+  ];
+in
+stdenv.mkDerivation rec {
+  pname = "mesa-gl-headers";
+
+  # These are a bigger rebuild and don't change often, so keep them separate.
+  version = "25.0.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "mesa";
+    repo = "mesa";
+    rev = "mesa-${version}";
+    hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    for header in ${toString headers}; do
+      install -Dm444 $header $out/$header
+    done
+  '';
+
+  passthru = { inherit headers; };
+
+  inherit (common) meta;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3feea755f81b..ae79b42a313c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9905,6 +9905,7 @@ with pkgs;
   mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra
 
   libgbm = callPackage ../development/libraries/mesa/gbm.nix {};
+  mesa-gl-headers = callPackage ../development/libraries/mesa/headers.nix {};
 
   ## End libGL/libGLU/Mesa stuff