diff options
| author | Izorkin <izorkin@elven.pw> | 2019-08-02 12:49:04 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-08-02 13:31:13 +0300 |
| commit | 21e891efd1aa158ad8de07fbb0b2f61780428711 (patch) | |
| tree | be96aed865e69fbdc4d03600cb8becc744cef7d2 /pkgs/servers/sql | |
| parent | 12f95f75726ded0807d0184b3b55084fcddca5ea (diff) | |
| download | nixlib-21e891efd1aa158ad8de07fbb0b2f61780428711.tar nixlib-21e891efd1aa158ad8de07fbb0b2f61780428711.tar.gz nixlib-21e891efd1aa158ad8de07fbb0b2f61780428711.tar.bz2 nixlib-21e891efd1aa158ad8de07fbb0b2f61780428711.tar.lz nixlib-21e891efd1aa158ad8de07fbb0b2f61780428711.tar.xz nixlib-21e891efd1aa158ad8de07fbb0b2f61780428711.tar.zst nixlib-21e891efd1aa158ad8de07fbb0b2f61780428711.zip | |
mariadb: fix build in Darwin
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch | 12 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch b/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch new file mode 100644 index 000000000000..64652c08c19c --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch @@ -0,0 +1,12 @@ +diff --git a/libmariadb/plugins/auth/CMakeLists.txt b/libmariadb/plugins/auth/CMakeLists.txt +index aa599418..7a51f73b 100644 +--- a/libmariadb/plugins/auth/CMakeLists.txt ++++ b/libmariadb/plugins/auth/CMakeLists.txt +@@ -50,6 +50,7 @@ IF(WITH_SSL) + ${REF10_SOURCES} + ${CRYPT_SOURCE} + INCLUDES ${REF10_DIR} ++ LIBRARIES ${ED25519_LIBS} + COMPILE_OPTIONS -DMYSQL_CLIENT=1) + IF(MSVC) + # Silence conversion (integer truncantion) warnings from reference code diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 2f923116b2bf..7d34dd8d63be 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -53,6 +53,7 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch ./cmake-libmariadb-includedir.patch + ./cmake-fix-crypt-libs.patch ]; cmakeFlags = [ |