diff --git a/pkgs/by-name/pr/proxysql/btree-cstdint.patch b/pkgs/by-name/pr/proxysql/btree-cstdint.patch
new file mode 100644
index 000000000000..c5eae1c371d2
--- /dev/null
+++ b/pkgs/by-name/pr/proxysql/btree-cstdint.patch
@@ -0,0 +1,16 @@
+The vendored copy of Google's cpp-btree relies on <cstdint> being pulled in
+transitively.  libstdc++ 15 no longer does so, which makes uint8_t/uint16_t
+undeclared, and the resulting fallback to int trips the kNodeValues
+COMPILE_ASSERT with a "1 << 32" shift.
+
+diff --git a/include/btree.h b/include/btree.h
+--- a/include/btree.h
++++ b/include/btree.h
+@@ -104,6 +104,7 @@
+ #include <stddef.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <cstdint>
+ #include <algorithm>
+ #include <functional>
+ #include <iostream>
diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch
index 17facc6744c1..bc47db822b4a 100644
--- a/pkgs/by-name/pr/proxysql/makefiles.patch
+++ b/pkgs/by-name/pr/proxysql/makefiles.patch
@@ -151,7 +151,7 @@ index 87d2a20e..505e069a 100644
  	cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz
  	cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch
 -	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
-+	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
++	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_C_FLAGS=-std=gnu17 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
  ifeq ($(PROXYDEBUG),1)
  	cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
  else ifeq ($(USEVALGRIND),1)
diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix
index 852c812b6d66..e31b2d20537d 100644
--- a/pkgs/by-name/pr/proxysql/package.nix
+++ b/pkgs/by-name/pr/proxysql/package.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./makefiles.patch
     ./dont-phone-home.patch
+    ./btree-cstdint.patch
   ];
 
   nativeBuildInputs = [