Commit 637008b3 authored by Justin Chen's avatar Justin Chen
Browse files

fcp: fix build 

The build failure was caused by a trailing semicolon in a macro used as
expressions, which would be rejected by future Rust compilers.

Closes #471144
parent 17f5134b

pkgs/by-name/fc/fcp/0002-trailing-semicolon-in-macro.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/src/filesystem.rs b/src/filesystem.rs

index 28c2a01..cfc8fcb 100644

--- a/src/filesystem.rs

+++ b/src/filesystem.rs

@@ -44,7 +44,7 @@ wrap2!(copy, fs, u64);

 

 macro_rules! make_error_message {

     ($path:ident) => {

-        |err| Error::new(format!("{}: {}", $path.display(), err));

+        |err| Error::new(format!("{}: {}", $path.display(), err))

     };

 }

pkgs/by-name/fc/fcp/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ rustPlatform.buildRustPackage rec { 
    sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";

  };



  patches = [

    ./0002-trailing-semicolon-in-macro.patch

  ];



  cargoPatches = [

    (fetchpatch {

      url = "https://github.com/Svetlitski/fcp/commit/1988f88be54a507b804b037cb3887fecf11bb571.patch";