From 44f9f11cfda45fb68128ca685895bcdcea732dfc Mon Sep 17 00:00:00 2001
From: ivan770 <ivan@ivan770.me>
Date: Fri, 1 Mar 2024 17:38:40 -0500
Subject: [PATCH] chore: cleanup Nix

---
 flake.nix            | 12 ++----------
 nix/node-testing.nix |  2 +-
 nix/package.nix      | 13 +++++++++++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 94d05c5..b947215 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,14 +89,6 @@
           RUSTFLAGS = "-Ctarget-feature=+simd128";
           CARGO_BUILD_TARGET = "wasm32-unknown-unknown";
           CARGO_NET_GIT_FETCH_WITH_CLI = "true";
-          CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "wasm-ld";
-
-          nativeBuildInputs = [
-            wasm-pack
-            pkgs.wasm-bindgen-cli
-            pkgs.binaryen
-            pkgs.llvmPackages.lld
-          ];
         };
 
         cargoArtifacts = craneLib.buildDepsOnly (commonArgs
@@ -109,11 +101,11 @@
           });
 
         esm = pkgs.callPackage ./nix/package.nix {
-          inherit cargoArtifacts commonArgs craneLib;
+          inherit cargoArtifacts commonArgs craneLib wasm-pack;
         };
 
         cjs = pkgs.callPackage ./nix/package.nix {
-          inherit cargoArtifacts commonArgs craneLib;
+          inherit cargoArtifacts commonArgs craneLib wasm-pack;
 
           buildForNode = true;
         };
diff --git a/nix/node-testing.nix b/nix/node-testing.nix
index f643364..0768abd 100644
--- a/nix/node-testing.nix
+++ b/nix/node-testing.nix
@@ -6,7 +6,7 @@
   nodejs,
   prefetch-yarn-deps,
   yarn,
-  yarnLockHash
+  yarnLockHash,
 }:
 stdenvNoCC.mkDerivation {
   inherit src;
diff --git a/nix/package.nix b/nix/package.nix
index 37ac988..59e2f7b 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -1,8 +1,11 @@
 {
-  cargoArtifacts,
-  commonArgs,
   craneLib,
   lib,
+  binaryen,
+  cargoArtifacts,
+  commonArgs,
+  wasm-bindgen-cli,
+  wasm-pack,
   # FIXME: Unify two separate packages into one.
   buildForNode ? false,
 }: let
@@ -15,6 +18,12 @@ in
     // {
       inherit cargoArtifacts;
 
+      nativeBuildInputs = [
+        binaryen
+        wasm-bindgen-cli
+        wasm-pack
+      ];
+
       buildPhaseCargoCommand = ''
         HOME=$(mktemp -d)