pyrox.dev / nixpkgs
lol
fork atom

mariadb galera: fix build (#41813)

authored by

Izorkin and committed by
xeji 1705428c fd97db43

+4 -3
+3 -3
pkgs/servers/sql/mariadb/default.nix
··· 2 2 , libiconv, openssl, pcre, boost, judy, bison, libxml2 3 3 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl 4 4 , fixDarwinDylibNames, cctools, CoreServices 5 - , asio, buildEnv, check, qt4, scons 5 + , asio, buildEnv, check, scons 6 6 }: 7 7 8 8 with stdenv.lib; ··· 225 225 sha256 = "11pfc85z29jk0h6g6bmi3hdv4in4yb00xsr2r0qm1b0y7m2wq3ra"; 226 226 }; 227 227 228 - buildInputs = [ asio boost check openssl qt4 scons ]; 228 + buildInputs = [ asio boost check openssl scons ]; 229 229 230 230 patchPhase = '' 231 231 substituteInPlace SConstruct \ ··· 233 233 ''; 234 234 235 235 preConfigure = '' 236 - export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" 236 + export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" 237 237 export LIBPATH="${galeraLibs}/lib" 238 238 ''; 239 239
+1
pkgs/top-level/all-packages.nix
··· 12800 12800 rpcbind = callPackage ../servers/rpcbind { }; 12801 12801 12802 12802 mariadb = callPackage ../servers/sql/mariadb { 12803 + asio = asio_1_10; 12803 12804 inherit (darwin) cctools; 12804 12805 inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; 12805 12806 };