build(nix): fix darwin-to-darwin builds

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
bytecodealliance · Oct 17, 2023 · 1253aa1 · 1253aa1
1 parent a45a512
commit 1253aa1
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/flake.nix b/flake.nix
@@ -189,14 +189,19 @@
                   doCheck = false;
                 });
               });
+
+            darwin2darwin = pkgs.stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isDarwin;
+            buildInputs' =
+              buildInputs
+              ++ optional darwin2darwin pkgs.libiconv;
           in
-            optionalAttrs (craneArgs ? cargoArtifacts) {
+            {
+              buildInputs = buildInputs';
+            }
+            // optionalAttrs (craneArgs ? cargoArtifacts) {
               buildInputs =
-                buildInputs
-                ++ optionals (pkgs.stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isDarwin) [
-                  pkgs.darwin.apple_sdk.frameworks.Security
-                  pkgs.libiconv
-                ];
+                buildInputs'
+                ++ optional darwin2darwin pkgs.darwin.apple_sdk.frameworks.Security;
 
               # only lock deps in non-dep builds
               preBuild =