BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

proxysql: fix build by using vendored jemalloc 5.2.0

Browse source
This commit is contained in:
ajs124 2022-06-10 23:21:28 +02:00 committed by Martin Weinelt
parent e9218500ba
commit 8ed5858763
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/servers/sql/proxysql/default.nix
View file

@ -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; }

6
pkgs/servers/sql/proxysql/makefiles.patch
View file

@ -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}