diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 18:27:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 18:29:12 +0200 |
| commit | acca6d22931e99430a6da2cfdfdcb2819fabc08e (patch) | |
| tree | 5587aeb3f4a50c482fb6307bf83cae4d10377997 /pkgs | |
| parent | 3aef93e8f046210f1715b555d835f2f20cd07753 (diff) | |
| download | nixlib-acca6d22931e99430a6da2cfdfdcb2819fabc08e.tar nixlib-acca6d22931e99430a6da2cfdfdcb2819fabc08e.tar.gz nixlib-acca6d22931e99430a6da2cfdfdcb2819fabc08e.tar.bz2 nixlib-acca6d22931e99430a6da2cfdfdcb2819fabc08e.tar.lz nixlib-acca6d22931e99430a6da2cfdfdcb2819fabc08e.tar.xz nixlib-acca6d22931e99430a6da2cfdfdcb2819fabc08e.tar.zst nixlib-acca6d22931e99430a6da2cfdfdcb2819fabc08e.zip | |
libreoffice: remove a flaky test on i686
... by a patch from Debian.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 8739f08fbd62..d873ca0a02f0 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. |