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

mysql.server: fix build

Browse Source 
That moveToOutput should've been only for the client
This commit is contained in:
Robin Gloster 2017-07-22 18:54:41 +02:00
parent ee1c85aee9
commit 77af1d2000
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,6 @@ common = rec { # attributes common to both builds
postInstall = '' postInstall = ''
rm "$out"/lib/*.a rm "$out"/lib/*.a
find "''${!outputBin}/bin" -name '*test*' -delete find "''${!outputBin}/bin" -name '*test*' -delete
moveToOutput bin/mariadb_config "$dev"
''; '';
passthru.mysqlVersion = "5.7"; passthru.mysqlVersion = "5.7";
@ -107,6 +106,7 @@ client = stdenv.mkDerivation (common // {
# prevent cycle; it needs to reference $dev # prevent cycle; it needs to reference $dev
postInstall = common.postInstall + '' postInstall = common.postInstall + ''
moveToOutput bin/mysql_config "$dev" moveToOutput bin/mysql_config "$dev"
moveToOutput bin/mariadb_config "$dev"
''; '';
enableParallelBuilding = true; # the client should be OK enableParallelBuilding = true; # the client should be OK