diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-07 22:44:57 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-07 22:44:57 +0200 |
commit | b94559dc7f88d52faf4b48ef94fd2837941fd13e (patch) | |
tree | b01c4aaf0dc3658df156de397945e84c4ebeeb68 /pkgs/servers | |
parent | 65dcc797ebf505efb1e6d2c7906249f9534061d0 (diff) |
mariadb: make the attribute point to the full build
It will create least surprises. Only those who want to go light have to choose.
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7bbf0d57751e1..090291e410128 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 ]; |