diff options
| author | 0x4A6F <0x4A6F@users.noreply.github.com> | 2023-11-14 20:30:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 20:30:27 +0100 |
| commit | 39c1b481272ca66f19b4ddd06afa87148bbcef95 (patch) | |
| tree | b827074101b8a2bca630c0058676da60f9e6bbc0 /pkgs/servers | |
| parent | b1c25de57b225245433fb95fd995cb7293ed6af6 (diff) | |
| parent | 85fa2ee24552d51662708982cf446c10eaff87f5 (diff) | |
Merge pull request #267430 from helsinki-systems/fix/proxysql-build
proxysql: use vendored re2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/proxysql/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/proxysql/makefiles.patch | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index e24487f30dbf3..9c8087887ea36 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -26,7 +26,6 @@ , perl , python3 , prometheus-cpp -, re2 , zlib , texinfo }: @@ -117,7 +116,6 @@ stdenv.mkDerivation (finalAttrs: { { f = "lz4"; p = lz4; } { f = "pcre"; p = pcre; } { f = "prometheus-cpp"; p = prometheus-cpp; } - { f = "re2"; p = re2; } ] )} diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index 04e469ae13520..6a6d003a60883 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -143,17 +143,6 @@ index 710e070b..fd1352f6 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch -@@ -321,10 +289,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a - - - re2/re2/obj/libre2.a: -- cd re2 && rm -rf re2-*/ || true -- cd re2 && tar -zxf re2-*.tar.gz --# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile --# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch - cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch - ifeq ($(UNAME_S),Darwin) - cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile @@ -339,8 +303,6 @@ re2: re2/re2/obj/libre2.a |