Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cargo-web: Fix build failure #345812

Merged
merged 1 commit into from
Oct 4, 2024
Merged

cargo-web: Fix build failure #345812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions pkgs/development/tools/rust/cargo-web/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform
, CoreServices, Security
{
lib,
stdenv,
fetchFromGitHub,
openssl,
perl,
pkg-config,
rustPlatform,
CoreServices,
Security,
fetchpatch,
}:

rustPlatform.buildRustPackage rec {
Expand All @@ -13,16 +22,34 @@ rustPlatform.buildRustPackage rec {
sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd";
};

patches = [
(fetchpatch {
name = "fix-qualified-path.patch";
url = "https://github.com/koute/cargo-web/commit/c9584542163d60d0aae6d6890509794e838e257f.patch";
hash = "sha256-w59fXmrszptKt0llqGt0AF+0b3r9N6xUY6zQkpZnemE=";
})
Comment on lines +26 to +30
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not opposed to this fix but it make may sense to just disable warnings-as-error as clippy will keep getting more lints over time.

];

cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA=";

nativeBuildInputs = [ openssl perl pkg-config ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ];
nativeBuildInputs = [
openssl
perl
pkg-config
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
CoreServices
Security
];

meta = with lib; {
description = "Cargo subcommand for the client-side Web";
mainProgram = "cargo-web";
homepage = "https://github.com/koute/cargo-web";
license = with licenses; [ asl20 /* or */ mit ];
license = with licenses; [
asl20 # or
mit
];
maintainers = with maintainers; [ kevincox ];
};
}