From 03a5c683bff81df17b50feed3ffc72e5570cd904 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Sep 2026 21:48:23 +0200 Subject: [PATCH] mysql-shell_{8,9}: fix build w/ glibc-2.44 Failing Hydra build: https://hydra.nixos.org/build/344169786 --- pkgs/development/tools/mysql-shell/8.nix | 7 +++++++ pkgs/development/tools/mysql-shell/9.nix | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 238742bd3ebf..7c6b7680e282 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -29,6 +29,7 @@ cyrus_sasl, openldap, antlr, + fetchpatch, }: let @@ -66,6 +67,12 @@ stdenv.mkDerivation (finalAttrs: { # No openssl bundling on macOS. It's not working. # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53 ./no-openssl-bundling.patch + + # fix build w/ glibc-2.44 + (fetchpatch { + url = "https://github.com/mysql/mysql-shell/commit/4ce8746d8a7eecf9ae66d4d500c84d57cc4fbdbb.patch"; + hash = "sha256-LUGC7gnNQ3zhmWUm2xogsOAmx8QSngQBHVJMWHFtWz0="; + }) ]; postPatch = '' diff --git a/pkgs/development/tools/mysql-shell/9.nix b/pkgs/development/tools/mysql-shell/9.nix index 14843a23f189..5f68b885640e 100644 --- a/pkgs/development/tools/mysql-shell/9.nix +++ b/pkgs/development/tools/mysql-shell/9.nix @@ -29,6 +29,7 @@ cyrus_sasl, openldap, antlr, + fetchpatch, }: let @@ -66,6 +67,12 @@ stdenv.mkDerivation (finalAttrs: { # No openssl bundling on macOS. It's not working. # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53 ./no-openssl-bundling.patch + + # fix build w/ glibc-2.44 + (fetchpatch { + url = "https://github.com/mysql/mysql-shell/commit/4ce8746d8a7eecf9ae66d4d500c84d57cc4fbdbb.patch"; + hash = "sha256-LUGC7gnNQ3zhmWUm2xogsOAmx8QSngQBHVJMWHFtWz0="; + }) ]; postPatch = ''