diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-06-01 11:22:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-06-01 11:22:50 +0200 |
| commit | cb58ba1c5515792e5e4e24d6aa28b042fab3cffe (patch) | |
| tree | b3811745965b847d371a80b15814421c230fe3a3 | |
| parent | Merge pull request #124595 from mohe2015/backport-124347-21.05 (diff) | |
| download | nixpkgs-cb58ba1c5515792e5e4e24d6aa28b042fab3cffe.tar.gz | |
zstd: patch test flakiness on i686
https://hydra.nixos.org/build/143933617/nixlog/246/tail
The last attempt I see on 21.05 has failed:
https://hydra.nixos.org/build/144447049#tabs-buildsteps
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index e890518a45a9..2740ebde5bd6 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, bash, gnugrep , fixDarwinDylibNames , file , legacySupport ? false @@ -24,7 +24,13 @@ stdenv.mkDerivation rec { # This patches makes sure we do not attempt to use the MD5 implementation # of the host platform when running the tests ./playtests-darwin.patch - ]; + ] ++ lib.optional stdenv.is32bit + (fetchpatch { # https://github.com/facebook/zstd/pull/2606 + name = "test-memory-usage.diff"; + url = "https://github.com/facebook/zstd/commit/6f40571a.diff"; + sha256 = "1484k5b99wplv9vjvvxjn88l13hlay6bynhq3zh1nd34whyi1kd0"; + }); + postPatch = lib.optionalString (!static) '' substituteInPlace build/cmake/CMakeLists.txt \ |