Skip to content

Commit

Permalink
silicon: patch Cargo.lock for Rust 1.80 (#337499)
Browse files Browse the repository at this point in the history
  • Loading branch information
0x4A6F authored Aug 26, 2024
2 parents e87eca7 + d6667b5 commit acb4534
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
16 changes: 12 additions & 4 deletions pkgs/by-name/si/silicon/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions pkgs/by-name/si/silicon/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

rustPlatform.buildRustPackage rec {
pname = "silicon";
# Remove `postPatch` hack below when updating.
version = "0.5.2";

src = fetchFromGitHub {
Expand All @@ -33,6 +34,11 @@ rustPlatform.buildRustPackage rec {
};
};

postPatch = ''
# Fix build with Rust 1.80; remove when fixed upstream
ln -sf ${./Cargo.lock} Cargo.lock
'';

buildInputs = [ expat freetype fira-code fontconfig harfbuzz ]
++ lib.optionals stdenv.isLinux [ libxcb ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
Expand Down

0 comments on commit acb4534

Please sign in to comment.