mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-20 11:11:43 -04:00
e0464e4788
In preparation for the deprecation of `stdenv.isX`. These shorthands are not conducive to cross-compilation because they hide the platforms. Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way One example of why this is bad and especially affects compiler packages https://www.github.com/NixOS/nixpkgs/pull/343059 There are too many files to go through manually but a treewide should get users thinking when they see a `hostPlatform.isX` in a place where it doesn't make sense. ``` fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is" fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is" ```
63 lines
1.8 KiB
Nix
63 lines
1.8 KiB
Nix
{ lib
|
|
, stdenv
|
|
, fetchFromGitLab
|
|
, fetchpatch
|
|
, autoreconfHook
|
|
, libcap
|
|
}:
|
|
|
|
stdenv.mkDerivation rec {
|
|
pname = "torsocks";
|
|
version = "2.4.0";
|
|
|
|
src = fetchFromGitLab {
|
|
domain = "gitlab.torproject.org";
|
|
group = "tpo";
|
|
owner = "core";
|
|
repo = "torsocks";
|
|
rev = "v${version}";
|
|
sha256 = "sha256-ocJkoF9LMLC84ukFrm5pzjp/1gaXqDz8lzr9TdG+f88=";
|
|
};
|
|
|
|
patches = [
|
|
# fix compatibility with C99
|
|
# https://gitlab.torproject.org/tpo/core/torsocks/-/merge_requests/9
|
|
(fetchpatch {
|
|
url = "https://gitlab.torproject.org/tpo/core/torsocks/-/commit/1171bf2fd4e7a0cab02cf5fca59090b65af9cd29.patch";
|
|
hash = "sha256-qu5/0fy72+02QI0cVE/6YrR1kPuJxsZfG8XeODqVOPY=";
|
|
})
|
|
# tsocks_libc_accept4 only exists on Linux, use tsocks_libc_accept on other platforms
|
|
(fetchpatch {
|
|
url = "https://gitlab.torproject.org/tpo/core/torsocks/uploads/eeec9833512850306a42a0890d283d77/0001-Fix-macros-for-accept4-2.patch";
|
|
hash = "sha256-XWi8+UFB8XgBFSl5QDJ+hLu/dH4CvAwYbeZz7KB10Bs=";
|
|
})
|
|
# no gethostbyaddr_r on darwin
|
|
./torsocks-gethostbyaddr-darwin.patch
|
|
];
|
|
|
|
postPatch = ''
|
|
# Patch torify_app()
|
|
sed -i \
|
|
-e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \
|
|
src/bin/torsocks.in
|
|
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
|
|
sed -i \
|
|
-e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \
|
|
src/bin/torsocks.in
|
|
'';
|
|
|
|
nativeBuildInputs = [ autoreconfHook ];
|
|
|
|
doInstallCheck = true;
|
|
installCheckTarget = "check-recursive";
|
|
|
|
meta = {
|
|
description = "Wrapper to safely torify applications";
|
|
mainProgram = "torsocks";
|
|
homepage = "https://gitlab.torproject.org/tpo/core/torsocks";
|
|
license = lib.licenses.gpl2Plus;
|
|
platforms = lib.platforms.unix;
|
|
maintainers = with lib.maintainers; [ thoughtpolice ];
|
|
};
|
|
}
|