diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
| commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
| tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/tools/networking/maxscale | |
| parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
| download | nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip | |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'pkgs/tools/networking/maxscale')
| -rw-r--r-- | pkgs/tools/networking/maxscale/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 32f6b11d77c..d047646fa71 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, glibc -, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb +, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - bison2 curl flex gperftools jansson jemalloc kerberos lua mariadb.connector-c + bison2 curl flex gperftools jansson jemalloc kerberos lua libmysqlclient ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl libaio libedit libtool libui libuuid zlib ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { postInstall = '' find $out/bin -type f -perm -0100 | while read f1; do patchelf \ - --set-rpath "$(patchelf --print-rpath $f1):${mariadb.connector-c}/lib/mariadb:$out/lib/maxscale" \ + --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \ --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \ && patchelf --shrink-rpath $f1 done |