nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb*: fix build for x86_64-darwin and musl

Browse Source 
The previous change of moving CXXFLAGS into env overwrote the
env variables specified in the "common" attrSet which is the
base for the attrs passed to mkDerivation.
This commit is contained in:
Stefan Frijters
2026-02-21 11:16:42 +01:00
parent 054a330ccd
commit 7495f3f862
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/sql/mariadb/default.nix
View File

@@ -365,9 +365,11 @@ let
rm -r "$out"/OFF
'';
env = lib.optionalAttrs stdenv.hostPlatform.isi686 {
CXXFLAGS = "-fpermissive";
};
env =
lib.optionalAttrs stdenv.hostPlatform.isi686 {
CXXFLAGS = "-fpermissive";
}
// (common.env or { });
passthru = {
inherit client;