From d7c565cadce6915ea45026c8a4f420a0ed01fa59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Tue, 26 Nov 2024 10:05:59 +0100
Subject: [PATCH] remove empty libgcc_eh

---
 default.nix |  3 +--
 package.nix | 19 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/default.nix b/default.nix
index 195ad0a8..b1b2a4ba 100644
--- a/default.nix
+++ b/default.nix
@@ -54,7 +54,6 @@ let
     pkg-config = pkgs.pkg-config;
     buildNoDefaultFeatures = !defaultFeatures;
     buildFeatures = lib.strings.splitString "," features;
-    libunwind = pkgs.llvmPackages.libunwind;
   };
 
   # HACK: https://github.com/NixOS/nixpkgs/issues/177129
@@ -73,7 +72,7 @@ himalaya.overrideAttrs (drv: {
   version = "1.0.0";
 
   propagatedBuildInputs = (drv.propagatedBuildInputs or [ ])
-    ++ lib.optional hostPlatform.isWindows empty-libgcc_eh;
+    ++ lib.optional false empty-libgcc_eh;
 
   postInstall = (drv.postInstall or "") + lib.optionalString hostPlatform.isWindows ''
     export WINEPREFIX="$(${lib.getExe' mktemp "mktemp"} -d)"
diff --git a/package.nix b/package.nix
index aea291f5..3fa8d109 100644
--- a/package.nix
+++ b/package.nix
@@ -1,5 +1,4 @@
 { lib
-, libunwind
 , pkg-config
 , rustPlatform
 , windows
@@ -30,14 +29,14 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
 
-  NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) [
-    "-L${windows.mcfgthreads}/lib"
-    "-L${libunwind}/lib"
-    # "-L${windows.mingwrt}/lib"
-    #"-L${windows.w32api}/lib"
-    "-lmcfgthread"
-    "-lunwind"
-  ];
+  # NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) [
+  #   "-L${windows.mcfgthreads}/lib"
+  #   "-L${libunwind}/lib"
+  #   # "-L${windows.mingwrt}/lib"
+  #   #"-L${windows.w32api}/lib"
+  #   "-lmcfgthread"
+  #   "-lunwind"
+  # ];
 
   # unit tests only
   doCheck = false;
@@ -49,7 +48,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ ]
     ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk
-    ++ lib.optional (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) windows.mcfgthreads
+    # ++ lib.optional (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) windows.mcfgthreads
     ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch
     ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;