diff options
| author | Izorkin <izorkin@elven.pw> | 2020-05-15 12:27:27 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2020-05-23 15:32:46 +0300 |
| commit | a1ec0288122ab8e1ebcf800a0c4fadcf51c87414 (patch) | |
| tree | 8aa181435d72975b4dc1bc3909d22f3310bf42a1 | |
| parent | 2f0396776e6815df3c26a6648e91402c7e427133 (diff) | |
| download | nixlib-a1ec0288122ab8e1ebcf800a0c4fadcf51c87414.tar nixlib-a1ec0288122ab8e1ebcf800a0c4fadcf51c87414.tar.gz nixlib-a1ec0288122ab8e1ebcf800a0c4fadcf51c87414.tar.bz2 nixlib-a1ec0288122ab8e1ebcf800a0c4fadcf51c87414.tar.lz nixlib-a1ec0288122ab8e1ebcf800a0c4fadcf51c87414.tar.xz nixlib-a1ec0288122ab8e1ebcf800a0c4fadcf51c87414.tar.zst nixlib-a1ec0288122ab8e1ebcf800a0c4fadcf51c87414.zip | |
mariadb: move mariadb_mtr to share/pam
| -rw-r--r-- | pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch | 12 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 8 |
2 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch b/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch deleted file mode 100644 index 864ee818d3c1..000000000000 --- a/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt -index a556b870..918a26f9 100644 ---- a/plugin/auth_pam/CMakeLists.txt -+++ b/plugin/auth_pam/CMakeLists.txt -@@ -22,7 +22,6 @@ IF(HAVE_PAM_APPL_H) - COMPONENT Server) - ENDIF() - IF(TARGET auth_pam OR TARGET auth_pam_v1) -- ADD_SUBDIRECTORY(testing) - ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) - TARGET_LINK_LIBRARIES(pam_user_map pam) - SET_TARGET_PROPERTIES (pam_user_map PROPERTIES PREFIX "") diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9af4fe0f0f1a..9c2134e211ff 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -162,10 +162,7 @@ server = stdenv.mkDerivation (common // { ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; - patches = common.patches ++ [ - # Disable build unused plugin pam_mariadb_mtr.so. See https://jira.mariadb.org/browse/MDEV-21654 - ./cmake-disable-auth-pam-testing.patch - ] ++ optionals stdenv.hostPlatform.isDarwin [ + patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -204,6 +201,9 @@ server = stdenv.mkDerivation (common // { chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data + mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security + mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security + rm -r "$out"/OFF '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' |