From e8a74bb1563917b8694a5737dc6befbad38cb640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Mon, 25 Nov 2024 21:38:00 +0100 Subject: [PATCH] add missing mcfgthreads windows build input on i686 --- default.nix | 1 + package.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/default.nix b/default.nix index 65a08dd1..6607e7ba 100644 --- a/default.nix +++ b/default.nix @@ -43,6 +43,7 @@ let stdenv = pkgs.stdenv; apple-sdk = if pkgs.stdenv.hostPlatform.isx86_64 then pkgs.apple-sdk_13 else pkgs.apple-sdk_14; installShellFiles = false; + windows = pkgs.windows; installShellCompletions = false; installManPages = false; notmuch = pkgs.notmuch; diff --git a/package.nix b/package.nix index a8809e59..9444ea33 100644 --- a/package.nix +++ b/package.nix @@ -1,6 +1,7 @@ { lib , pkg-config , rustPlatform +, windows , fetchFromGitHub , stdenv , apple-sdk @@ -37,6 +38,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk + ++ 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;