diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-06-01 16:09:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-06-01 16:09:50 +0200 |
| commit | 9660a9f481b486c56e699315c746234bf64dab7a (patch) | |
| tree | d0e7fb3850f21de212f67582026daf985eea4282 | |
| parent | Merge branch 'discord-backport' into release-21.05 (diff) | |
| parent | zstd: patch test flakiness on i686 (diff) | |
| download | nixpkgs-9660a9f481b486c56e699315c746234bf64dab7a.tar.gz | |
Merge #125185: zstd: patch test flakiness on i686
| -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 \ |