public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libreoffice: remove a flaky test on i686

Browse Source 
... by a patch from Debian.
This commit is contained in:
Vladimír Čunát 2016-08-29 18:27:44 +02:00
parent 3aef93e8f0
commit acca6d2293
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/office/libreoffice/still.nix
View File

@ -69,6 +69,16 @@ in stdenv.mkDerivation rec {
sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x"; 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 # Openoffice will open libcups dynamically, so we link it directly
# to make its dlopen work. # to make its dlopen work.
# It also seems not to mention libdl explicitly in some places. # It also seems not to mention libdl explicitly in some places.