diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fca3bdedf9fb..41b7bc383b60 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -50,11 +50,11 @@ common = rec { # attributes common to both builds ''; patches = [ - ./cmake-includedir.patch + ./patch/cmake-includedir.patch ] # Fixes a build issue as documented on # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073 - ++ lib.optional (!stdenv.isLinux) ./macos-MDEV-26769-regression-fix.patch; + ++ lib.optional (!stdenv.isLinux) ./patch/macos-MDEV-26769-regression-fix.patch; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" @@ -134,7 +134,7 @@ client = stdenv.mkDerivation (common // { outputs = [ "out" "man" ]; patches = common.patches ++ [ - ./cmake-plugin-includedir.patch + ./patch/cmake-plugin-includedir.patch ]; cmakeFlags = common.cmakeFlags ++ [ diff --git a/pkgs/servers/sql/mariadb/cmake-includedir.patch b/pkgs/servers/sql/mariadb/patch/cmake-includedir.patch similarity index 100% rename from pkgs/servers/sql/mariadb/cmake-includedir.patch rename to pkgs/servers/sql/mariadb/patch/cmake-includedir.patch diff --git a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch b/pkgs/servers/sql/mariadb/patch/cmake-plugin-includedir.patch similarity index 100% rename from pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch rename to pkgs/servers/sql/mariadb/patch/cmake-plugin-includedir.patch diff --git a/pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch b/pkgs/servers/sql/mariadb/patch/macos-MDEV-26769-regression-fix.patch similarity index 100% rename from pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch rename to pkgs/servers/sql/mariadb/patch/macos-MDEV-26769-regression-fix.patch