From 77af1d2000dc4c169f10823d5991f658170cd8fd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 22 Jul 2017 18:54:41 +0200 Subject: [PATCH] mysql.server: fix build That moveToOutput should've been only for the client --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3b48a666132b..a73c870f5395 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -70,7 +70,6 @@ common = rec { # attributes common to both builds postInstall = '' rm "$out"/lib/*.a find "''${!outputBin}/bin" -name '*test*' -delete - moveToOutput bin/mariadb_config "$dev" ''; passthru.mysqlVersion = "5.7"; @@ -107,6 +106,7 @@ client = stdenv.mkDerivation (common // { # prevent cycle; it needs to reference $dev postInstall = common.postInstall + '' moveToOutput bin/mysql_config "$dev" + moveToOutput bin/mariadb_config "$dev" ''; enableParallelBuilding = true; # the client should be OK