From 99995bc9308507bb5443cc703b067083199f216b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 5 Jun 2021 07:34:46 +0200
Subject: [PATCH] zstd.patches: clean up

This was discussed on PR #125185.
---
 pkgs/tools/compression/zstd/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 2740ebde5bd..9c42e4f6d27 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -24,12 +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
+    # https://github.com/facebook/zstd/pull/2606
+    (fetchpatch {
       name = "test-memory-usage.diff";
-      url = "https://github.com/facebook/zstd/commit/6f40571a.diff";
+      url = "https://github.com/facebook/zstd/commit/6f40571ae2feb8bfa0a56f9871b6ee3084085fc2.diff";
       sha256 = "1484k5b99wplv9vjvvxjn88l13hlay6bynhq3zh1nd34whyi1kd0";
-    });
+    })
+  ];
 
 
   postPatch = lib.optionalString (!static) ''