diff --git a/pkgs/by-name/nd/ndstrim/package.nix b/pkgs/by-name/nd/ndstrim/package.nix index 130f7f3dbc44..9545b7627ffe 100644 --- a/pkgs/by-name/nd/ndstrim/package.nix +++ b/pkgs/by-name/nd/ndstrim/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, rustPlatform, }: @@ -16,31 +15,9 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KgtejBbFg6+klc8OpCs1CIb+7uVPCtP0/EM671vxauk="; }; - patches = [ - # https://github.com/Nemris/ndstrim/pull/1 - (fetchpatch { - name = "update-cargo-lock.patch"; - url = "https://github.com/Nemris/ndstrim/commit/8147bb31a8fb5765f33562957a61cb6ddbe65513.patch"; - hash = "sha256-HsCc5un9dg0gRkRjwxtjms0cugqWhcTthGfcF50EgYA="; - }) - ]; - useFetchCargoVendor = true; cargoHash = "sha256-wRMMWeZDk9Xt3263pq20Qioy1x8egiPhuoPxmpNTq8M="; - # TODO: remove this after upstream merge above patch. - # Without the workaround below the build results in the following error: - # Validating consistency between /build/source/Cargo.lock and /build/ndstrim-0.2.1-vendor.tar.gz/Cargo.lock - # - # < version = "0.2.1" - # --- - # > version = "0.1.0" - # - # ERROR: cargoHash or cargoSha256 is out of date - postPatch = '' - cargoSetupPostPatchHook() { true; } - ''; - meta = with lib; { description = "Trim the excess padding found in Nintendo DS(i) ROMs"; homepage = "https://github.com/Nemris/ndstrim";