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

mariadb galera: fix build (#41813)

Browse Source
This commit is contained in:
Izorkin 2018-06-11 21:42:53 +03:00 committed by xeji
parent fd97db43bc
commit 1705428cf9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, libiconv, openssl, pcre, boost, judy, bison, libxml2 , libiconv, openssl, pcre, boost, judy, bison, libxml2
, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools, CoreServices , fixDarwinDylibNames, cctools, CoreServices
, asio, buildEnv, check, qt4, scons , asio, buildEnv, check, scons
}: }:
with stdenv.lib; with stdenv.lib;
@ -225,7 +225,7 @@ galera = stdenv.mkDerivation rec {
sha256 = "11pfc85z29jk0h6g6bmi3hdv4in4yb00xsr2r0qm1b0y7m2wq3ra"; sha256 = "11pfc85z29jk0h6g6bmi3hdv4in4yb00xsr2r0qm1b0y7m2wq3ra";
}; };
buildInputs = [ asio boost check openssl qt4 scons ]; buildInputs = [ asio boost check openssl scons ];
patchPhase = '' patchPhase = ''
substituteInPlace SConstruct \ substituteInPlace SConstruct \
@ -233,7 +233,7 @@ galera = stdenv.mkDerivation rec {
''; '';
preConfigure = '' 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" export LIBPATH="${galeraLibs}/lib"
''; '';

1
pkgs/top-level/all-packages.nix
View File

@ -12800,6 +12800,7 @@ with pkgs;
rpcbind = callPackage ../servers/rpcbind { }; rpcbind = callPackage ../servers/rpcbind { };
mariadb = callPackage ../servers/sql/mariadb { mariadb = callPackage ../servers/sql/mariadb {
asio = asio_1_10;
inherit (darwin) cctools; inherit (darwin) cctools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
}; };