pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
"threadpool_multiple_event_loops" # times out on slow machines
|
||||
"get_passwd" # passed on NixOS but failed on other Linuxes
|
||||
"tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Sometimes: timeout (no output), failed uv_listen. Someone
|
||||
# should report these failures to libuv team. There tests should
|
||||
# be much more robust.
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
"fs_event_watch_dir_recursive" "fs_event_watch_file"
|
||||
"fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path"
|
||||
"process_priority" "udp_create_early_bad_bind"
|
||||
] ++ stdenv.lib.optionals stdenv.isAarch32 [
|
||||
] ++ lib.optionals stdenv.isAarch32 [
|
||||
# I observe this test failing with some regularity on ARMv7:
|
||||
# https://github.com/libuv/libuv/issues/1871
|
||||
"shutdown_close_pipe"
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ automake autoconf libtool pkg-config ];
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
|
||||
|
||||
preConfigure = ''
|
||||
LIBTOOLIZE=libtoolize ./autogen.sh
|
||||
|
||||
Reference in New Issue
Block a user