diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index e890518a45a..2740ebde5bd 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 \