From 01ab36d8752c2efe901136f19c18ea309b995ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Sep 2021 11:36:56 +0200 Subject: [PATCH] mariadb.client: fixup build I expect it got broken by mariadb update in PR #132916 (a160dfbf3). --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 29c6e6f00897..a49c0549a668 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -95,7 +95,7 @@ common = rec { # attributes common to both builds rm "$out"/bin/{mariadb_config,mysql_config} rm -r $out/include rm -r $out/lib/pkgconfig - rm -r $out/share/aclocal + rm -rf "$out"/share/aclocal ''; passthru.mysqlVersion = "5.7"; @@ -135,7 +135,7 @@ client = stdenv.mkDerivation (common // { ]; postInstall = common.postInstall + '' - rm -r "$out"/share/doc + rm -rf "$out"/share/doc rm "$out"/bin/{mysqltest,mytop} libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}}