diff options
| author | Robin Gloster <mail@glob.in> | 2017-07-30 22:08:19 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | 52e65be0d6cabc8ebcc853d68bb5b7b1055155d9 (patch) | |
| tree | 64e4f26f8538be645e2cb5db33d15af3711958f3 /pkgs/servers | |
| parent | 5672ca2d0be758cc39867d729b3c4a2b25ea67a8 (diff) | |
| download | nixpkgs-52e65be0d6cabc8ebcc853d68bb5b7b1055155d9.tar nixpkgs-52e65be0d6cabc8ebcc853d68bb5b7b1055155d9.tar.gz nixpkgs-52e65be0d6cabc8ebcc853d68bb5b7b1055155d9.tar.bz2 nixpkgs-52e65be0d6cabc8ebcc853d68bb5b7b1055155d9.tar.lz nixpkgs-52e65be0d6cabc8ebcc853d68bb5b7b1055155d9.tar.xz nixpkgs-52e65be0d6cabc8ebcc853d68bb5b7b1055155d9.tar.zst nixpkgs-52e65be0d6cabc8ebcc853d68bb5b7b1055155d9.zip | |
mariadb: fix i686 build
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1eaf6c4e32e..a1fa2ef3079 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -128,9 +128,7 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] - ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ] - ; + ] ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" @@ -164,6 +162,8 @@ everything = stdenv.mkDerivation (common // { rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 ''; + + CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; }); connector-c = stdenv.mkDerivation rec { |