summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2021-08-02 17:56:41 +0200
committerVladimír Čunát <v@cunat.cz>2021-08-02 17:56:41 +0200
commit43c5cae2c667612d41f85739e15657033d239b82 (patch)
tree65529be1a64ba6f1f71c8c6df81c716ea3e1d674 /pkgs
parent05240cfbaafa8f51fa0d6be56dedbd06f9fb356c (diff)
parent895ce97eeadded30c897022b1768b645df21501e (diff)
downloadnixpkgs-43c5cae2c667612d41f85739e15657033d239b82.tar
nixpkgs-43c5cae2c667612d41f85739e15657033d239b82.tar.gz
nixpkgs-43c5cae2c667612d41f85739e15657033d239b82.tar.bz2
nixpkgs-43c5cae2c667612d41f85739e15657033d239b82.tar.lz
nixpkgs-43c5cae2c667612d41f85739e15657033d239b82.tar.xz
nixpkgs-43c5cae2c667612d41f85739e15657033d239b82.tar.zst
nixpkgs-43c5cae2c667612d41f85739e15657033d239b82.zip
Merge #132422: knot-dns: disable tests broken on aarch64-darwin
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/dns/knot-dns/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 3e3bcaf1e00..e6f17b599a2 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -27,6 +27,12 @@ stdenv.mkDerivation rec {
     ./runtime-deps.patch
   ];
 
+  # Disable knotd journal tests on platforms that don't use 4k sysconf(_SC_PAGESIZE).
+  # The journal most likely works fine, but some of the tests currently don't.
+  postPatch = lib.optionalString (doCheck && stdenv.isDarwin && stdenv.isAarch64) ''
+    sed '/^\tknot\/test_journal\>/d' -i tests/Makefile.am
+  '';
+
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [
     gnutls liburcu libidn2 libunistring