From 39e4d93649ce8cbe5f3ad6467c545df0125fb816 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 22 Dec 2016 11:30:03 +0100 Subject: libuv: disable tests broken on Hydra They were broken by nix starting to use user namespaces. --- pkgs/development/libraries/libuv/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index db77a6fefc3a..f9e7cf389bbb 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig - , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { @@ -13,10 +12,15 @@ stdenv.mkDerivation rec { sha256 = "0gna53fgsjjs38kv1g20xfaalv0fk3xncb6abga3saswrv283hx0"; }; - # these checks are probably network-dependent - postPatch = lib.optionalString doCheck '' - sed '/getnameinfo_basic/d' -i test/test-list.h - ''; + postPatch = let + toDisable = [ + "getnameinfo_basic" # probably network-dependent + "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces + ]; + tdRegexp = lib.concatStringsSep "\\|" toDisable; + in lib.optionalString doCheck '' + sed '/${tdRegexp}/d' -i test/test-list.h + ''; buildInputs = [ automake autoconf libtool pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; -- cgit 1.4.1