From 62572ee90976a39f148b0b23c6bd5b99925f2103 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 6 Dec 2021 19:28:16 +0100 Subject: [PATCH] mariadb: Drop stale LLVM 11 fix Upstream has updated to no longer need the changes messing with the `version` file. --- pkgs/servers/sql/mariadb/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7501dab6a1b..82fdc2a3a38 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -47,14 +47,6 @@ common = rec { # attributes common to both builds prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt - # libc++abi 11 uses `#include `, include paths often include - # project dirs and that means files with version numbers get included as if - # they were a header. This includes files name `VERSION` on - # case-insensitive file systems. - 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 = [