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

mariadb: remove broken link file rcmysql

Browse Source
This commit is contained in:
Izorkin 2017-12-28 11:50:51 +03:00 committed by Robin Gloster
parent 2bbb4810f4
commit 88657b3a50
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,6 @@ common = rec { # attributes common to both builds
}; };
}; };
client = stdenv.mkDerivation (common // { client = stdenv.mkDerivation (common // {
name = "mariadb-client-${common.version}"; name = "mariadb-client-${common.version}";
@ -97,9 +96,11 @@ client = stdenv.mkDerivation (common // {
preConfigure = common.preConfigure + '' preConfigure = common.preConfigure + ''
cmakeFlags="$cmakeFlags \ cmakeFlags="$cmakeFlags \
-DINSTALL_BINDIR=$bin/bin -DINSTALL_SCRIPTDIR=$bin/bin \ -DINSTALL_BINDIR=$bin/bin \
-DINSTALL_SCRIPTDIR=$bin/bin \
-DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \ -DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \
-DINSTALL_DOCDIR=$bin/share/doc/mysql -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \ -DINSTALL_DOCDIR=$bin/share/doc/mysql \
-DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \
" "
''; '';
@ -112,7 +113,6 @@ client = stdenv.mkDerivation (common // {
enableParallelBuilding = true; # the client should be OK enableParallelBuilding = true; # the client should be OK
}); });
everything = stdenv.mkDerivation (common // { everything = stdenv.mkDerivation (common // {
name = "mariadb-${common.version}"; name = "mariadb-${common.version}";
@ -154,6 +154,7 @@ everything = stdenv.mkDerivation (common // {
postInstall = common.postInstall + '' postInstall = common.postInstall + ''
rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data
rm "$out"/share/man/man1/mysql-test-run.pl.1 rm "$out"/share/man/man1/mysql-test-run.pl.1
rm "$out"/bin/rcmysql
''; '';
CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";