push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,40 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
pname = "proxychains";
version = "4.4.0";
src = fetchFromGitHub {
owner = "haad";
repo = "proxychains";
rev = "proxychains-${version}";
sha256 = "083xdg6fsn8c2ns93lvy794rixxq8va6jdf99w1z0xi4j7f1nyjw";
};
patches = [
# https://github.com/NixOS/nixpkgs/issues/136093
./swap-priority-4-and-5-in-get_config_path.patch
];
postPatch = ''
# Suppress compiler warning. Remove it when upstream fix arrives
substituteInPlace Makefile --replace "-Werror" "-Werror -Wno-stringop-truncation"
'';
installFlags = [
"install-config"
];
meta = with lib; {
description = "Proxifier for SOCKS proxies";
homepage = "https://proxychains.sourceforge.net";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fab ];
platforms = platforms.linux;
mainProgram = "proxychains4";
};
}

View File

@@ -0,0 +1,25 @@
diff --git a/src/common.c b/src/common.c
index 1ca612a..7c21377 100644
--- a/src/common.c
+++ b/src/common.c
@@ -37,13 +37,13 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
if(check_path(path))
return path;
- // priority 4: $SYSCONFDIR/proxychains.conf
- path = SYSCONFDIR "/" PROXYCHAINS_CONF_FILE;
+ // priority 4: /etc/proxychains.conf
+ path = "/etc/" PROXYCHAINS_CONF_FILE;
if(check_path(path))
return path;
- // priority 5: /etc/proxychains.conf
- path = "/etc/" PROXYCHAINS_CONF_FILE;
+ // priority 5: $SYSCONFDIR/proxychains.conf
+ path = SYSCONFDIR "/" PROXYCHAINS_CONF_FILE;
if(check_path(path))
return path;
--
2.37.2