Skip to content

Commit

Permalink
gg-jj: fetchCargoTarball -> fetchCargoVendor
Browse files Browse the repository at this point in the history
Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
  • Loading branch information
alyssais committed Jan 30, 2025
1 parent b19c3c8 commit 5154fd6
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions pkgs/by-name/gg/gg-jj/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
buildAndTestSubdir = "src-tauri";

# FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) pname version src patches;
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs)
pname
version
src
patches
;
# Tries to apply patches inside cargoRoot.
prePatch = "pushd ..";
postPatch = "popd";
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
hash = "sha256-inwETdMRKmJklkdjkcGuJuHaXwa5GyJEk7zo2r2li+M=";
hash = "sha256-zEYU5l57VxVKKhoGfa77kT05vwoLyAu9eyt7C9dhAGM=";
};

npmDeps = fetchNpmDeps {
Expand Down

0 comments on commit 5154fd6

Please sign in to comment.