From acca6d22931e99430a6da2cfdfdcb2819fabc08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 29 Aug 2016 18:27:44 +0200 Subject: [PATCH] libreoffice: remove a flaky test on i686 ... by a patch from Debian. --- pkgs/applications/office/libreoffice/still.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 8739f08fbd6..d873ca0a02f 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -69,6 +69,16 @@ in stdenv.mkDerivation rec { sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x"; }; + # we only have this problem on i686 ATM + patches = if stdenv.is64bit then null else [ + (fetchurl { + name = "disable-flaky-tests.diff"; + url = "https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git/plain" + + "/patches/disable-flaky-tests.diff?h=libreoffice_5.1.5_rc2-1"; + sha256 = "1v1aiqdi64iijjraj6v4ljzclrd9lqan54hmy2h6m20x3ab005wb"; + }) + ]; + # Openoffice will open libcups dynamically, so we link it directly # to make its dlopen work. # It also seems not to mention libdl explicitly in some places.