From 8ad96b7786134cba3d856ad5572080cef94f1640 Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <reactorcontrol@icloud.com>
Date: Tue, 9 Mar 2021 20:16:22 +0100
Subject: mcfgthreads: enable cross-compiling on Darwin

using -Werror is problematic in general, remove for all platforms
fixes #97214
---
 pkgs/os-specific/windows/mcfgthreads/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pkgs/os-specific/windows/mcfgthreads/default.nix')

diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 6c4cd171025..3f882557e50 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation {
     rm -r "$sourceRoot/debug" "$sourceRoot/release"
   '';
 
+  postPatch = ''
+    substituteInPlace Makefile.am --replace '-Werror' ''
+  '';
+
   nativeBuildInputs = [
     autoreconfHook
   ];
-- 
cgit 1.4.1


From 81e5833fd1e7e023fc26a9acdbcff99d5ccd0353 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 11 Mar 2021 23:48:12 +0100
Subject: mcfgthreads: fix syntax

PR #115603 / 8ad96b7786134cba3d856ad5572080cef94f1640 introduced a
syntax error by introducing an '' inside an indented string and thus a
syntax error. Was merged despite the failing ofborg check.
---
 pkgs/os-specific/windows/mcfgthreads/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/os-specific/windows/mcfgthreads/default.nix')

diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 3f882557e50..122848a4e6c 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   '';
 
   postPatch = ''
-    substituteInPlace Makefile.am --replace '-Werror' ''
+    substituteInPlace Makefile.am --replace '-Werror' ""
   '';
 
   nativeBuildInputs = [
-- 
cgit 1.4.1


From bc1f7c5d7f9660d8198760196ae6ac65bd3539e6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 12 Mar 2021 15:25:08 +0000
Subject: mcfgthreads: 9570e5ca -> 10y2x3x6

The latest version non longer has `-Werror` (at our request; thanks!) so
we no longer need to patch it out.
---
 pkgs/os-specific/windows/mcfgthreads/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'pkgs/os-specific/windows/mcfgthreads/default.nix')

diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 122848a4e6c..45c80ab8979 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "lhmouse";
     repo = "mcfgthread";
-    rev = "9570e5ca7b98002d707c502c919d951bf256b9c6";
-    sha256 = "10y2x3x601a7c1hkd6zlr3xpfsnlr05xl28v23clf619756a5755";
+    rev = "c446cf4fcdc262fc899a188a4bb7136284c34222";
+    sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f";
   };
 
   outputs = [ "out" "dev" ];
@@ -18,10 +18,6 @@ stdenv.mkDerivation {
     rm -r "$sourceRoot/debug" "$sourceRoot/release"
   '';
 
-  postPatch = ''
-    substituteInPlace Makefile.am --replace '-Werror' ""
-  '';
-
   nativeBuildInputs = [
     autoreconfHook
   ];
-- 
cgit 1.4.1