Merge pull request #134377 from Pamplemousse/pkgsStatic_fixes

zstd: Fix static build
This commit is contained in:
Jörg Thalheim
2021-08-17 07:13:19 +01:00
committed by GitHub
+7
View File
@@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep
, fixDarwinDylibNames
, file
, fetchpatch
, legacySupport ? false
, static ? stdenv.hostPlatform.isStatic
# these need to be ran on the host, thus disable when cross-compiling
@@ -27,6 +28,12 @@ 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
# Fixes linking for static builds
(fetchpatch {
url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch";
sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg=";
})
];
postPatch = lib.optionalString (!static) ''