diff options
author | Izorkin <Izorkin@gmail.com> | 2018-06-11 21:42:53 +0300 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-11 20:42:53 +0200 |
commit | 1705428cf90ee90ee5e7cdca8555a0f39ff39b13 (patch) | |
tree | cad6d04c0127914151883dc1cd6355f27be6e4bc /pkgs | |
parent | fd97db43bcb05e37f6bb77f363f1e1e239d9de53 (diff) | |
download | nixlib-1705428cf90ee90ee5e7cdca8555a0f39ff39b13.tar nixlib-1705428cf90ee90ee5e7cdca8555a0f39ff39b13.tar.gz nixlib-1705428cf90ee90ee5e7cdca8555a0f39ff39b13.tar.bz2 nixlib-1705428cf90ee90ee5e7cdca8555a0f39ff39b13.tar.lz nixlib-1705428cf90ee90ee5e7cdca8555a0f39ff39b13.tar.xz nixlib-1705428cf90ee90ee5e7cdca8555a0f39ff39b13.tar.zst nixlib-1705428cf90ee90ee5e7cdca8555a0f39ff39b13.zip |
mariadb galera: fix build (#41813)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 817ed9d11801..fee35a623330 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,7 +2,7 @@ , libiconv, openssl, pcre, boost, judy, bison, libxml2 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices -, asio, buildEnv, check, qt4, scons +, asio, buildEnv, check, scons }: with stdenv.lib; @@ -225,7 +225,7 @@ galera = stdenv.mkDerivation rec { sha256 = "11pfc85z29jk0h6g6bmi3hdv4in4yb00xsr2r0qm1b0y7m2wq3ra"; }; - buildInputs = [ asio boost check openssl qt4 scons ]; + buildInputs = [ asio boost check openssl scons ]; patchPhase = '' substituteInPlace SConstruct \ @@ -233,7 +233,7 @@ galera = stdenv.mkDerivation rec { ''; preConfigure = '' - export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" + export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" export LIBPATH="${galeraLibs}/lib" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04c11b8208b1..b0884fe5688c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12800,6 +12800,7 @@ with pkgs; rpcbind = callPackage ../servers/rpcbind { }; mariadb = callPackage ../servers/sql/mariadb { + asio = asio_1_10; inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; |