diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-13 23:28:12 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-14 12:22:45 +0100 |
| commit | ffc9bdea32339de7aef905e17cfe9c1bb643462e (patch) | |
| tree | f65d9d0af4894c193ecbf5dc233dc22d6b04dca4 /pkgs/development/libraries/libpsl | |
| parent | c14398f8717abad1a04deca8f0b36b12ea1dae22 (diff) | |
| download | nixpkgs-ffc9bdea32339de7aef905e17cfe9c1bb643462e.tar nixpkgs-ffc9bdea32339de7aef905e17cfe9c1bb643462e.tar.gz nixpkgs-ffc9bdea32339de7aef905e17cfe9c1bb643462e.tar.bz2 nixpkgs-ffc9bdea32339de7aef905e17cfe9c1bb643462e.tar.lz nixpkgs-ffc9bdea32339de7aef905e17cfe9c1bb643462e.tar.xz nixpkgs-ffc9bdea32339de7aef905e17cfe9c1bb643462e.tar.zst nixpkgs-ffc9bdea32339de7aef905e17cfe9c1bb643462e.zip | |
libpsl: fix darwin build
tests are failing there FAIL: test-is-public ==================== valgrind: mmap-FIXED(0x7fff5f400000, 8388608) failed in UME (load_unixthread1) with error 22 (Invalid argument). FAIL test-is-public (exit status: 1) FAIL: test-is-public-all ======================== valgrind: mmap-FIXED(0x7fff5f400000, 8388608) failed in UME (load_unixthread1) with error 22 (Invalid argument). FAIL test-is-public-all (exit status: 1) FAIL: test-is-cookie-domain-acceptable ====================================== valgrind: mmap-FIXED(0x7fff5f400000, 8388608) failed in UME (load_unixthread1) with error 22 (Invalid argument). FAIL test-is-cookie-domain-acceptable (exit status: 1) FAIL: test-is-public-builtin ============================ valgrind: mmap-FIXED(0x7fff5f400000, 8388608) failed in UME (load_unixthread1) with error 22 (Invalid argument). FAIL test-is-public-builtin (exit status: 1) FAIL: test-registrable-domain ============================= valgrind: mmap-FIXED(0x7fff5f400000, 8388608) failed in UME (load_unixthread1) with error 22 (Invalid argument). FAIL test-registrable-domain (exit status: 1)
Diffstat (limited to 'pkgs/development/libraries/libpsl')
| -rw-r--r-- | pkgs/development/libraries/libpsl/default.nix | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 15aa7c9e22d..d2012760dcf 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchurl, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, lzip -, libidn2, libunistring, libxslt, pkgconfig, python3, valgrind +{ stdenv +, fetchurl +, autoreconfHook +, docbook_xsl +, docbook_xml_dtd_43 +, gtk-doc +, lzip +, libidn2 +, libunistring +, libxslt +, pkgconfig +, python3 +, valgrind , publicsuffix-list }: @@ -12,9 +23,26 @@ stdenv.mkDerivation rec { sha256 = "183hadbira0d2zvv8272lspy31dgm9x26z35c61s5axcd5wd9g9i"; }; - nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc lzip pkgconfig python3 valgrind ]; - buildInputs = [ libidn2 libunistring libxslt ]; - propagatedBuildInputs = [ publicsuffix-list ]; + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + docbook_xml_dtd_43 + gtk-doc + lzip + pkgconfig + python3 + valgrind + ]; + + buildInputs = [ + libidn2 + libunistring + libxslt + ]; + + propagatedBuildInputs = [ + publicsuffix-list + ]; postPatch = '' patchShebangs src/psl-make-dafsa @@ -25,7 +53,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ -# "--enable-gtk-doc" + # "--enable-gtk-doc" "--enable-man" "--enable-valgrind-tests" "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" @@ -35,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "C library for the Publix Suffix List"; |