From 4a1b3830a8ff6b05ad9a2b27c8a2cdbd00a45787 Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Thu, 7 Dec 2023 12:28:29 +0900 Subject: gnu: dante: Enable preloading support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Dante uses dlopen which doesn't work with libc.so but libc.so.6. This fixes socksify, which is patched to skip invoking uname needlessly. * gnu/packages/networking.scm (dante): Enable preloading support. * gnu/packages/patches/dante-non-darwin.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. References: https://github.com/NixOS/nixpkgs/pull/68418#discussion_r343625853 Change-Id: I03a5b6b6e11cf6a0453a4968ff00c6dd627249a8 Signed-off-by: Ludovic Courtès --- gnu/packages/patches/dante-non-darwin.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 gnu/packages/patches/dante-non-darwin.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/dante-non-darwin.patch b/gnu/packages/patches/dante-non-darwin.patch new file mode 100644 index 0000000000..0ecb705c78 --- /dev/null +++ b/gnu/packages/patches/dante-non-darwin.patch @@ -0,0 +1,15 @@ +Disable runtime check for Darwin so we don't have to substitute uname. +--- a/bin/socksify.in ++++ b/bin/socksify.in +@@ -65,11 +65,6 @@ + unset FULLPATH + fi + +-#use "FLAT_NAMESPACE" on Darwin in attempt to match LD_PRELOAD behavior +-if test x`uname` = xDarwin; then +- export DYLD_FORCE_FLAT_NAMESPACE=t +-fi +- + #dlib/Makefile.am libtool flags should produce a predictable library name + #(ending in SOLIB_POSTFIX). + LIBRARY="${SOCKS_LIBRARY:-${FULLPATH}libdsocks.@SOLIB_POSTFIX@}" -- cgit v1.2.3