From b94559dc7f88d52faf4b48ef94fd2837941fd13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Aug 2016 22:44:57 +0200 Subject: [PATCH] mariadb: make the attribute point to the full build It will create least surprises. Only those who want to go light have to choose. --- pkgs/servers/sql/mariadb/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7bbf0d57751..090291e4101 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -8,10 +8,10 @@ with stdenv.lib; let # in mariadb # spans the whole file -mariadb = { - inherit client # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin - server; # currently a full build, including everything in `client` again - lib = client; # compat. with the old mariadb split +mariadb = everything // { + inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin + server = everything; # a full single-output build, including everything in `client` again + lib = client; # compat. with the old mariadb split }; @@ -104,7 +104,7 @@ client = stdenv.mkDerivation (common // { }); -server = stdenv.mkDerivation (common // { +everything = stdenv.mkDerivation (common // { name = "mariadb-${common.version}"; nativeBuildInputs = common.nativeBuildInputs ++ [ bison ];