From 51011985ef009bf950e3bfd76c1994c05fe7a361 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 12 Mar 2021 16:22:27 +0000 Subject: [PATCH] zstd: Remove no-pthread patch used for building with `mcfgthreads` Evidentially upstream has improved their feature detection so we no longer need this patch. CC @lhmouse --- pkgs/tools/compression/zstd/default.nix | 4 +--- .../compression/zstd/mcfgthreads-no-pthread.patch | 13 ------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 pkgs/tools/compression/zstd/mcfgthreads-no-pthread.patch diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index e1437e3843d..2da5a725e71 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 69921c0c7ba..00000000000 --- 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