diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-06-12 00:54:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-12 00:54:20 +0200 |
| commit | 37b7e36ed12d76d560aad23869ff0b9b5a578ed9 (patch) | |
| tree | 56b657dbd8140ca863c48b3e3fba03398c87b7cb /pkgs/servers/sql | |
| parent | f3333e86ad597a04f07813bd29301e32bf0bdbac (diff) | |
| parent | 8ed585876343b451ac5a730e5b56379eefff0dfd (diff) | |
Merge pull request #171859 from mweinelt/jemalloc
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/proxysql/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/proxysql/makefiles.patch | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index be1739f2b8afa..2e4ecd8bb974d 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -12,7 +12,6 @@ , curl , flex , gnutls -, jemalloc , libconfig , libdaemon , libev @@ -99,7 +98,6 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: ''replace_dep "${x.f}" "${x.p.src}" "${x.p.pname or (builtins.parseDrvName x.p.name).name}" "${x.p.name}"'') [ { f = "curl"; p = curl; } - { f = "jemalloc"; p = jemalloc; } { f = "libconfig"; p = libconfig; } { f = "libdaemon"; p = libdaemon; } { f = "libev"; p = libev; } diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index 270b6f1eefd8a..edc77a80ca5a9 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -112,7 +112,7 @@ cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/liblz4.a -@@ -148,16 +112,12 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a +@@ -148,16 +112,14 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: @@ -124,8 +124,8 @@ libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a jemalloc/jemalloc/lib/libjemalloc.a: -- cd jemalloc && rm -rf jemalloc-5.2.0 -- cd jemalloc && tar -jxf jemalloc-5.2.0.tar.bz2 + cd jemalloc && rm -rf jemalloc-5.2.0 + cd jemalloc && tar -jxf jemalloc-5.2.0.tar.bz2 cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue823.520.patch cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue2358.patch cd jemalloc/jemalloc && ./configure ${MYJEOPT} |