JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #200406 from figsoda/cargo-wasi

Browse Source 
cargo-wasi: switch to fetchCrate to remove patch
This commit is contained in:
figsoda 2022-11-10 20:52:33 -05:00 committed by GitHub
commit d68882a5d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1513
pkgs/development/tools/rust/cargo-wasi/0001-Add-Cargo.lock.patch
View File

File diff suppressed because it is too large Load Diff

25
pkgs/development/tools/rust/cargo-wasi/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv
, lib
, fetchFromGitHub
, openssl
, pkg-config
{ lib
, rustPlatform
, fetchCrate
, pkg-config
, stdenv
, openssl
, Security
}:
@ -11,24 +11,19 @@ rustPlatform.buildRustPackage rec {
pname = "cargo-wasi";
version = "0.1.26";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = version;
sha256 = "sha256-jugq7A3L+5+YUSyp9WWKBd4BA2pcXKd4CMVg5OVMcEA=";
src = fetchCrate {
inherit version;
pname = "cargo-wasi-src";
sha256 = "sha256-/u5GKqGwJWS6Gzc1WZ7O5ZSHHGoqBVZ4jQDEIfAyciE=";
};
cargoSha256 = "sha256-L4vRLYm1WaCmA4bGyY7D0yxXuqxGSHMMD/wlY8+MgPk=";
cargoSha256 = "sha256-eF3HrulY7HrKseCYyZyC2EuWboFvmia2qLymBxvopKI=";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
cargoPatches = [
./0001-Add-Cargo.lock.patch
];
# Checks need to be disabled here because the current test suite makes assumptions
# about the surrounding environment that aren't Nix friendly. See these lines for specifics:
# https://github.com/bytecodealliance/cargo-wasi/blob/0.1.26/tests/tests/support.rs#L13-L18