diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index a8fafb7f..afc35194 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -25,10 +25,9 @@ jobs:
           - system: i686-linux
             target: i686-unknown-linux-musl
             os: ubuntu-latest
-          # FIXME
-          # - system: i686-windows
-          #   target: i686-w64-mingw32
-          #   os: ubuntu-latest
+          - system: i686-windows
+            target: i686-w64-mingw32
+            os: ubuntu-latest
           - system: x86_64-macos
             target: x86_64-apple-darwin
             os: macos-13
diff --git a/default.nix b/default.nix
index fa1b24c9..128413aa 100644
--- a/default.nix
+++ b/default.nix
@@ -9,7 +9,7 @@ let
 
   pkgs = import (fetchTarball "https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz") {
     crossSystem = {
-      isStatic = true;
+      inherit isStatic;
       config = target;
     };
   };
diff --git a/package.nix b/package.nix
index f91d3cf5..db6e8595 100644
--- a/package.nix
+++ b/package.nix
@@ -38,12 +38,10 @@ rustPlatform.buildRustPackage rec {
     substituteInPlace package.nix --replace "-lgcc_eh" "-lgcc_s"
   '';
 
-  nativeBuildInputs = [ ]
-    ++ lib.optional (!hostPlatform.isLinux) pkg-config
+  nativeBuildInputs = [ pkg-config ]
     ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
 
   buildInputs = [ ]
-    ++ lib.optionals hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security ])
     ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch
     ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;
 
diff --git a/systems.nix b/systems.nix
index 4eebf5f5..a50cc552 100644
--- a/systems.nix
+++ b/systems.nix
@@ -31,7 +31,7 @@
 
   x86_64-apple-darwin = {
     rustTarget = "x86_64-apple-darwin";
-    isStatic = false;
+    isStatic = true;
   };
 
   x86_64-unknown-linux-musl = {