From 8b09fd98eb7b87f4ae71e3a0aed770831941450e Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Tue, 13 Jul 2021 00:23:45 +0200
Subject: [PATCH] mariadb: Rename "version" files for LLVM 11

Libc++abi 11 has `#include <version>` in some places. This clashes with
projects that have files named "version" in directories that end up on
the include path. This includes files named "VERSION" on
case-insensitive file systems.
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix      | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 82fdc2a3a38b..f183a1fb12b5 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -47,6 +47,10 @@ common = rec { # attributes common to both builds
 
   prePatch = ''
     sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
+    sed -i 's,/version\>,/version_full,' storage/mroonga/CMakeLists.txt
+    mv storage/mroonga/version storage/mroonga/version_full
+    sed -i 's,/VERSION\>,/VERSION_FULL,' cmake/mysql_version.cmake
+    mv VERSION VERSION_FULL
   '';
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60b38b7ca358..64376cc3a901 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21190,10 +21190,6 @@ with pkgs;
   };
 
   mariadb = callPackage ../servers/sql/mariadb {
-    # libcxx-11.1.0 includes `<version>` in some places and this picks up
-    # storage/mroonga/version under clang-11 so we build mariadb with a clang-7
-    # stdenv instead.
-    stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv;
     inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };