Merge pull request #142023 from figsoda/wasm-bindgen-cli-clean-up

wasm-bindgen-cli: clarify license, clean up

pkgs/development/tools/wasm-bindgen-cli/default.nix

@@ -1,8 +1,9 @@
-{ rustPlatform
-, fetchFromGitHub
-, lib
-, openssl
+{ lib
+, rustPlatform
+, fetchCrate
+, nodejs
 , pkg-config
+, openssl
 , stdenv
 , curl
 , Security
@@ -13,32 +14,27 @@ rustPlatform.buildRustPackage rec {
   pname = "wasm-bindgen-cli";
   version = "0.2.78";
 
-  src =
-    let
-      tarball = fetchFromGitHub {
-        owner = "rustwasm";
-        repo = "wasm-bindgen";
-        rev = version;
-        hash = "sha256-1Z5d4gjZUic6Yrd+O8oLWYpJqAYGcByZYP0H1iInXHA=";
-      };
-    in
-    runCommand "source" { } ''
-      cp -R ${tarball} $out
-      chmod -R +w $out
-      cp ${./Cargo.lock} $out/Cargo.lock
-    '';
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-5s+HidnVfDV0AXA+/YcXNGVjv/E9JeK0Ttng4mCVX8M=";
+  };
+
+  cargoSha256 = "sha256-CbtjUFwowP/QqyAMCzmUiSib4EpRhQAmO4ekX00xYGE=";
 
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
   nativeBuildInputs = [ pkg-config ];
 
-  cargoHash = "sha256-RixIEat7EzGzgSQTnPennePpiucmAatrDGhbFSfTajo=";
-  cargoBuildFlags = [ "-p" pname ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ];
+
+  checkInputs = [ nodejs ];
+
+  # other tests require it to be ran in the wasm-bindgen monorepo
+  cargoTestFlags = [ "--test=interface-types" ];
 
   meta = with lib; {
     homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
-    license = licenses.asl20;
+    license = with licenses; [ asl20 /* or */ mit ];
     description = "Facilitating high-level interactions between wasm modules and JavaScript";
     maintainers = with maintainers; [ ma27 nitsky rizary ];
-    platforms = platforms.unix;
+    mainProgram = "wasm-bindgen";
   };
 }

pkgs/top-level/all-packages.nix

@@ -10313,6 +10313,7 @@ with pkgs;
 
   wasm-bindgen-cli = callPackage ../development/tools/wasm-bindgen-cli {
     inherit (darwin.apple_sdk.frameworks) Security;
+    nodejs = nodejs_latest;
   };
 
   welkin = callPackage ../tools/graphics/welkin {};