diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-14 00:41:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-14 00:41:40 +0000 |
| commit | c596c930799f775a91d2606ae69ee6f3c359290d (patch) | |
| tree | 2a58c19e4a3c81e48089a82ab1caff15c07aa343 /pkgs/tools/compression | |
| parent | 01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0 (diff) | |
| parent | 86c7e9297d57437822ba166df98cc47f17ef255b (diff) | |
| download | nixlib-c596c930799f775a91d2606ae69ee6f3c359290d.tar nixlib-c596c930799f775a91d2606ae69ee6f3c359290d.tar.gz nixlib-c596c930799f775a91d2606ae69ee6f3c359290d.tar.bz2 nixlib-c596c930799f775a91d2606ae69ee6f3c359290d.tar.lz nixlib-c596c930799f775a91d2606ae69ee6f3c359290d.tar.xz nixlib-c596c930799f775a91d2606ae69ee6f3c359290d.tar.zst nixlib-c596c930799f775a91d2606ae69ee6f3c359290d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch | 13 |
2 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index e1437e3843db..2da5a725e71c 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./playtests-darwin.patch - ] # This I didn't upstream because if you use posix threads with MinGW it will - # work fine, and I'm not sure how to write the condition. - ++ lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; + ]; postPatch = lib.optionalString (!static) '' substituteInPlace build/cmake/CMakeLists.txt \ diff --git a/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch b/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch deleted file mode 100644 index 69921c0c7bad..000000000000 --- a/pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/programs/Makefile b/programs/Makefile -index 7882fe8c..1e8237bb 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -107,7 +107,7 @@ HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS - ifeq ($(HAVE_THREAD), 1) - THREAD_MSG := ==> building with threading support - THREAD_CPP := -DZSTD_MULTITHREAD --THREAD_LD := -pthread -+THREAD_LD := - else - THREAD_MSG := $(NO_THREAD_MSG) - endif |