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

Merge #125185: zstd: patch test flakiness on i686

Browse Source
This commit is contained in:
Vladimír Čunát 2021-06-01 16:09:50 +02:00
commit 9660a9f481
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/compression/zstd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, bash, gnugrep
, fixDarwinDylibNames , fixDarwinDylibNames
, file , file
, legacySupport ? false , legacySupport ? false
@ -24,7 +24,13 @@ stdenv.mkDerivation rec {
# This patches makes sure we do not attempt to use the MD5 implementation # This patches makes sure we do not attempt to use the MD5 implementation
# of the host platform when running the tests # of the host platform when running the tests
./playtests-darwin.patch ./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) '' postPatch = lib.optionalString (!static) ''
substituteInPlace build/cmake/CMakeLists.txt \ substituteInPlace build/cmake/CMakeLists.txt \