diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-09-12 11:36:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-09-12 11:42:22 +0200 |
| commit | 01ab36d8752c2efe901136f19c18ea309b995ac0 (patch) | |
| tree | f6996864a9f7d129c9ffeaaa96692cdaba245880 /pkgs | |
| parent | 45de5d0c9ae39ab958c5616007f8e525fe7ecacf (diff) | |
| download | nixpkgs-01ab36d8752c2efe901136f19c18ea309b995ac0.tar nixpkgs-01ab36d8752c2efe901136f19c18ea309b995ac0.tar.gz nixpkgs-01ab36d8752c2efe901136f19c18ea309b995ac0.tar.bz2 nixpkgs-01ab36d8752c2efe901136f19c18ea309b995ac0.tar.lz nixpkgs-01ab36d8752c2efe901136f19c18ea309b995ac0.tar.xz nixpkgs-01ab36d8752c2efe901136f19c18ea309b995ac0.tar.zst nixpkgs-01ab36d8752c2efe901136f19c18ea309b995ac0.zip | |
mariadb.client: fixup build
I expect it got broken by mariadb update in PR #132916 (a160dfbf3).
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 29c6e6f0089..a49c0549a66 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}} |