From d126f0b8c6a8b50786d21ed0da0b7343779a6e00 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 24 Oct 2020 10:15:33 +1000 Subject: [PATCH] libpsl: disable valgrind tests on darwin --- pkgs/development/libraries/libpsl/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index fb9e5b12bc61..67e87a5faab4 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { lzip pkgconfig python3 - (stdenv.lib.optionalString (!stdenv.isDarwin) valgrind) libxslt + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + valgrind ]; buildInputs = [ @@ -56,15 +57,16 @@ stdenv.mkDerivation rec { configureFlags = [ # "--enable-gtk-doc" "--enable-man" - "--enable-valgrind-tests" "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + "--enable-valgrind-tests" ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with stdenv.lib; { description = "C library for the Publix Suffix List";