nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-19 07:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql-shell_8: unpin stdenv

Browse Source
This commit is contained in:
Aaron Jheng
2026-05-08 18:08:40 +08:00
parent 5de23158ef
commit e8e00aa571
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/mysql-shell/8.nix
View File

@@ -75,6 +75,14 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
'';
env =
lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-literal-operator";
}
// lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
};
nativeBuildInputs = [
pkg-config
cmake

7
pkgs/top-level/all-packages.nix
View File

@@ -549,13 +549,6 @@ with pkgs;
protobuf = protobuf_25.override {
abseil-cpp = abseil-cpp_202407;
};
stdenv =
if stdenv.cc.isClang then
llvmPackages_19.stdenv
else if stdenv.cc.isGNU then
gcc14Stdenv
else
stdenv;
};
mysql-shell_9 = callPackage ../development/tools/mysql-shell/9.nix {