diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/libraries/libpsl | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/libraries/libpsl')
-rw-r--r-- | pkgs/development/libraries/libpsl/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index fdc352869f0..85afe93ea7a 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoreconfHook , docbook_xsl @@ -8,13 +8,15 @@ , libidn2 , libunistring , libxslt -, pkgconfig +, pkg-config , python3 , valgrind , publicsuffix-list }: -stdenv.mkDerivation rec { +let + enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind; +in stdenv.mkDerivation rec { pname = "libpsl"; version = "0.21.0"; @@ -29,10 +31,11 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 gtk-doc lzip - pkgconfig + pkg-config python3 - valgrind libxslt + ] ++ lib.optionals enableValgrindTests [ + valgrind ]; buildInputs = [ @@ -56,17 +59,18 @@ 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" + ] ++ lib.optionals enableValgrindTests [ + "--enable-valgrind-tests" ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "C library for the Publix Suffix List"; longDescription = '' libpsl is a C library for the Publix Suffix List (PSL). A "public suffix" |