tor: remove --disable-seccomp
on aarch64-linux, simplify (#425537)
This commit is contained in:
commit
92f6efa4bd
@ -1,5 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
coreutils,
|
||||
gnugrep,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
@ -16,17 +19,6 @@
|
||||
nixosTests,
|
||||
writeShellScript,
|
||||
versionCheckHook,
|
||||
|
||||
# for update.nix
|
||||
writeScript,
|
||||
common-updater-scripts,
|
||||
bash,
|
||||
coreutils,
|
||||
curl,
|
||||
gnugrep,
|
||||
gnupg,
|
||||
gnused,
|
||||
nix,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -91,12 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[ "--enable-gpl" ]
|
||||
++
|
||||
# cross compiles correctly but needs the following
|
||||
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ]
|
||||
++
|
||||
# sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599
|
||||
lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
"--disable-seccomp"
|
||||
];
|
||||
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ];
|
||||
|
||||
NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";
|
||||
|
||||
@ -126,20 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
tests.tor = nixosTests.tor;
|
||||
updateScript = import ./update.nix {
|
||||
inherit lib;
|
||||
inherit
|
||||
writeScript
|
||||
common-updater-scripts
|
||||
bash
|
||||
coreutils
|
||||
curl
|
||||
gnupg
|
||||
gnugrep
|
||||
gnused
|
||||
nix
|
||||
;
|
||||
};
|
||||
updateScript = callPackage ./update.nix { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user