public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59624 from LnL7/darwin-libuv

Browse Source 
libuv: fix darwin sandbox build
This commit is contained in:
Daiderd Jordan 2019-04-20 15:46:25 +02:00 committed by GitHub
commit cc6b56d381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/libraries/libuv/default.nix
View File

@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
"spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
"getaddrinfo_fail" "getaddrinfo_fail_sync" "getaddrinfo_fail" "getaddrinfo_fail_sync"
"threadpool_multiple_event_loops" # times out on slow machines "threadpool_multiple_event_loops" # times out on slow machines
] ] ++ stdenv.lib.optionals stdenv.isDarwin [
# Sometimes: timeout (no output), failed uv_listen. Someone # Sometimes: timeout (no output), failed uv_listen. Someone
# should report these failures to libuv team. There tests should # should report these failures to libuv team. There tests should
# be much more robust. # be much more robust.
++ stdenv.lib.optionals stdenv.isDarwin [
"process_title" "emfile" "poll_duplex" "poll_unidirectional" "process_title" "emfile" "poll_duplex" "poll_unidirectional"
"ipc_listen_before_write" "ipc_listen_after_write" "ipc_tcp_connection" "ipc_listen_before_write" "ipc_listen_after_write" "ipc_tcp_connection"
"tcp_alloc_cb_fail" "tcp_ping_pong" "tcp_ref3" "tcp_ref4" "tcp_alloc_cb_fail" "tcp_ping_pong" "tcp_ref3" "tcp_ref4"
@ -34,11 +33,16 @@ stdenv.mkDerivation rec {
"multiple_listen" "delayed_accept" "multiple_listen" "delayed_accept"
"shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
"tty_pty" "condvar_5" "tty_pty" "condvar_5"
] ++ stdenv.lib.optionals stdenv.isAarch32 [ # Tests that fail when sandboxing is enabled.
# I observe this test failing with some regularity on ARMv7: "fs_event_close_in_callback" "fs_event_watch_dir"
# https://github.com/libuv/libuv/issues/1871 "fs_event_watch_dir_recursive" "fs_event_watch_file"
"shutdown_close_pipe" "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path"
]; "process_priority" "udp_create_early_bad_bind"
] ++ stdenv.lib.optionals stdenv.isAarch32 [
# I observe this test failing with some regularity on ARMv7:
# https://github.com/libuv/libuv/issues/1871
"shutdown_close_pipe"
];
tdRegexp = lib.concatStringsSep "\\|" toDisable; tdRegexp = lib.concatStringsSep "\\|" toDisable;
in lib.optionalString doCheck '' in lib.optionalString doCheck ''
sed '/${tdRegexp}/d' -i test/test-list.h sed '/${tdRegexp}/d' -i test/test-list.h
@ -55,6 +59,9 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
meta = with lib; { meta = with lib; {
description = "A multi-platform support library with a focus on asynchronous I/O"; description = "A multi-platform support library with a focus on asynchronous I/O";
homepage = https://github.com/libuv/libuv; homepage = https://github.com/libuv/libuv;