ndstrim: remove workaround (#409796)

authored by Aleksana and committed by GitHub 1066c4b8 61efce5d

-23
-23
pkgs/by-name/nd/ndstrim/package.nix
··· 1 1 { 2 2 lib, 3 3 fetchFromGitHub, 4 - fetchpatch, 5 4 rustPlatform, 6 5 }: 7 6 ··· 16 15 hash = "sha256-KgtejBbFg6+klc8OpCs1CIb+7uVPCtP0/EM671vxauk="; 17 16 }; 18 17 19 - patches = [ 20 - # https://github.com/Nemris/ndstrim/pull/1 21 - (fetchpatch { 22 - name = "update-cargo-lock.patch"; 23 - url = "https://github.com/Nemris/ndstrim/commit/8147bb31a8fb5765f33562957a61cb6ddbe65513.patch"; 24 - hash = "sha256-HsCc5un9dg0gRkRjwxtjms0cugqWhcTthGfcF50EgYA="; 25 - }) 26 - ]; 27 - 28 18 useFetchCargoVendor = true; 29 19 cargoHash = "sha256-wRMMWeZDk9Xt3263pq20Qioy1x8egiPhuoPxmpNTq8M="; 30 - 31 - # TODO: remove this after upstream merge above patch. 32 - # Without the workaround below the build results in the following error: 33 - # Validating consistency between /build/source/Cargo.lock and /build/ndstrim-0.2.1-vendor.tar.gz/Cargo.lock 34 - # <hash> 35 - # < version = "0.2.1" 36 - # --- 37 - # > version = "0.1.0" 38 - # 39 - # ERROR: cargoHash or cargoSha256 is out of date 40 - postPatch = '' 41 - cargoSetupPostPatchHook() { true; } 42 - ''; 43 20 44 21 meta = with lib; { 45 22 description = "Trim the excess padding found in Nintendo DS(i) ROMs";