diff options
| author | Izorkin <Izorkin@gmail.com> | 2017-12-28 11:50:51 +0300 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | 88657b3a50f2bdc4cfa9cc2a629b1382def08228 (patch) | |
| tree | 148eeb7e1daef86202618430b687cd24a16493d2 /pkgs/servers | |
| parent | 2bbb4810f4d4cf8328c95df72a1243c78817a073 (diff) | |
| download | nixlib-88657b3a50f2bdc4cfa9cc2a629b1382def08228.tar nixlib-88657b3a50f2bdc4cfa9cc2a629b1382def08228.tar.gz nixlib-88657b3a50f2bdc4cfa9cc2a629b1382def08228.tar.bz2 nixlib-88657b3a50f2bdc4cfa9cc2a629b1382def08228.tar.lz nixlib-88657b3a50f2bdc4cfa9cc2a629b1382def08228.tar.xz nixlib-88657b3a50f2bdc4cfa9cc2a629b1382def08228.tar.zst nixlib-88657b3a50f2bdc4cfa9cc2a629b1382def08228.zip | |
mariadb: remove broken link file rcmysql
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9b041bc8703e..66125b353783 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -83,7 +83,6 @@ common = rec { # attributes common to both builds }; }; - client = stdenv.mkDerivation (common // { name = "mariadb-client-${common.version}"; @@ -97,9 +96,11 @@ client = stdenv.mkDerivation (common // { preConfigure = common.preConfigure + '' cmakeFlags="$cmakeFlags \ - -DINSTALL_BINDIR=$bin/bin -DINSTALL_SCRIPTDIR=$bin/bin \ + -DINSTALL_BINDIR=$bin/bin \ + -DINSTALL_SCRIPTDIR=$bin/bin \ -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 }); - everything = stdenv.mkDerivation (common // { name = "mariadb-${common.version}"; @@ -154,6 +154,7 @@ everything = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' 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"/bin/rcmysql ''; CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; |