Unverified Commit 301ae036 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

libpsl: disable testing with valgrind 

We plan to enable libpsl support on curl, but including valgrind here
causes a cyclic dependency on curl.

As the tests have been disabled on various platforms already, this is
probably the cheapest place to resolve the dependency chain.
parent 2220b9a4

pkgs/development/libraries/libpsl/default.nix

+1 −14
Original line number Diff line number Diff line
@@ -14,16 +14,7 @@ 
, publicsuffix-list

}:



let

  enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind

    # Apparently valgrind doesn't support some new ARM features on (some) Hydra machines:

    #  VEX: Mismatch detected between RDMA and atomics features.

    && !stdenv.isAarch64

    # Valgrind on musl does not hook malloc calls properly, resulting in errors `Invalid free() / delete / delete[] / realloc()`

    # https://bugs.kde.org/show_bug.cgi?id=435441

    && !stdenv.hostPlatform.isMusl

  ;

in stdenv.mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "libpsl";

  version = "0.21.5";
@@ -41,8 +32,6 @@ in stdenv.mkDerivation rec { 
    pkg-config

    python3

    libxslt

  ] ++ lib.optionals enableValgrindTests [

    valgrind

  ];



  buildInputs = [
@@ -69,8 +58,6 @@ in stdenv.mkDerivation rec { 
    "--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"

  ] ++ lib.optionals enableValgrindTests [

    "--enable-valgrind-tests"

  ];



  enableParallelBuilding = true;