JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mariadb: make the attribute point to the full build

Browse Source 
It will create least surprises. Only those who want to go light
have to choose.
This commit is contained in:
Vladimír Čunát 2016-08-07 22:44:57 +02:00
parent 65dcc797eb
commit b94559dc7f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/sql/mariadb/default.nix
View File

@ -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 ];