diff options
| author | Izorkin <izorkin@elven.pw> | 2021-11-18 10:46:01 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2021-11-19 20:58:04 +0300 |
| commit | 1fa2e5fdc98cde196b4c8fa97314254b11138e96 (patch) | |
| tree | fb0d69263af28e64861c75873db358cf9d52f7d2 /pkgs/servers/sql | |
| parent | 595511e63283fb705c98c07732d63755a729bf5e (diff) | |
| download | nixpkgs-1fa2e5fdc98cde196b4c8fa97314254b11138e96.tar nixpkgs-1fa2e5fdc98cde196b4c8fa97314254b11138e96.tar.gz nixpkgs-1fa2e5fdc98cde196b4c8fa97314254b11138e96.tar.bz2 nixpkgs-1fa2e5fdc98cde196b4c8fa97314254b11138e96.tar.lz nixpkgs-1fa2e5fdc98cde196b4c8fa97314254b11138e96.tar.xz nixpkgs-1fa2e5fdc98cde196b4c8fa97314254b11138e96.tar.zst nixpkgs-1fa2e5fdc98cde196b4c8fa97314254b11138e96.zip | |
mariadb: move patches to subfolder
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/patch/cmake-includedir.patch (renamed from pkgs/servers/sql/mariadb/cmake-includedir.patch) | 0 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/patch/cmake-plugin-includedir.patch (renamed from pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch) | 0 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/patch/macos-MDEV-26769-regression-fix.patch (renamed from pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fca3bdedf9f..41b7bc383b6 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 index 0c4fe7d321e..0c4fe7d321e 100644 --- a/pkgs/servers/sql/mariadb/cmake-includedir.patch +++ b/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 index d2a4535f7ba..d2a4535f7ba 100644 --- a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch +++ b/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 index 8c0e6f78e28..8c0e6f78e28 100644 --- a/pkgs/servers/sql/mariadb/macos-MDEV-26769-regression-fix.patch +++ b/pkgs/servers/sql/mariadb/patch/macos-MDEV-26769-regression-fix.patch |