pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
}:
|
||||
let
|
||||
tor-client-auth-gen = writeShellScript "tor-client-auth-gen" ''
|
||||
PATH="${stdenv.lib.makeBinPath [coreutils gnugrep openssl]}"
|
||||
PATH="${lib.makeBinPath [coreutils gnugrep openssl]}"
|
||||
pem="$(openssl genpkey -algorithm x25519)"
|
||||
|
||||
printf private_key=descriptor:x25519:
|
||||
@@ -41,15 +41,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++
|
||||
stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
|
||||
lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
|
||||
|
||||
patches = [ ./disable-monotonic-timer-tests.patch ];
|
||||
|
||||
# cross compiles correctly but needs the following
|
||||
configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
"--disable-tool-name-check";
|
||||
|
||||
NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
|
||||
NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace contrib/client-tools/torify \
|
||||
|
||||
Reference in New Issue
Block a user