about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/by-name/wa/wasm-bindgen-cli/package.nix49
-rw-r--r--pkgs/development/tools/wasm-bindgen-cli/default.nix42
-rw-r--r--pkgs/top-level/all-packages.nix5
3 files changed, 49 insertions, 47 deletions
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix
new file mode 100644
index 000000000000..517b2813478f
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  rustPlatform,
+  fetchCrate,
+  nix-update-script,
+  nodejs_latest,
+  pkg-config,
+  openssl,
+  stdenv,
+  curl,
+  darwin,
+  version ? "0.2.93",
+  hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=",
+  cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=",
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "wasm-bindgen-cli";
+  inherit version hash cargoHash;
+
+  src = fetchCrate { inherit pname version hash; };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [
+      curl
+      darwin.apple_sdk.frameworks.Security
+    ];
+
+  nativeCheckInputs = [ nodejs_latest ];
+
+  # tests require it to be ran in the wasm-bindgen monorepo
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
+    license = with lib.licenses; [
+      asl20 # or
+      mit
+    ];
+    description = "Facilitating high-level interactions between wasm modules and JavaScript";
+    maintainers = with lib.maintainers; [ rizary ];
+    mainProgram = "wasm-bindgen";
+  };
+}
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
deleted file mode 100644
index 3b0a6c1b53eb..000000000000
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib
-, rustPlatform
-, fetchCrate
-, nix-update-script
-, nodejs
-, pkg-config
-, openssl
-, stdenv
-, curl
-, Security
-, version ? "0.2.93"
-, hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="
-, cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "wasm-bindgen-cli";
-  inherit version hash cargoHash;
-
-  src = fetchCrate {
-    inherit pname version hash;
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ];
-
-  nativeCheckInputs = [ nodejs ];
-
-  # tests require it to be ran in the wasm-bindgen monorepo
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
-    license = with licenses; [ asl20 /* or */ mit ];
-    description = "Facilitating high-level interactions between wasm modules and JavaScript";
-    maintainers = with maintainers; [ rizary ];
-    mainProgram = "wasm-bindgen";
-  };
-
-  passthru.updateScript = nix-update-script { };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b893ed3ad6d..103b9dce1b2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13781,11 +13781,6 @@ with pkgs;
   wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1";
   wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1";
 
-  wasm-bindgen-cli = callPackage ../development/tools/wasm-bindgen-cli {
-    inherit (darwin.apple_sdk.frameworks) Security;
-    nodejs = nodejs_latest;
-  };
-
   wasm-tools = callPackage ../tools/misc/wasm-tools { };
 
   wasmedge = callPackage ../development/tools/wasmedge {