Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 1 insertions, 13 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
index b25f74b90f66..1bab5b951837 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
@@ -16,18 +16,6 @@ rustPlatform.buildRustPackage {
     inherit rev sha256;
   };
 
-  # FIXME: Temporary fixes for our rust 1.45.0
-  cargoPatches = [
-    ./downgrade-smol_str.patch # Requires rustc 1.46.0
-  ];
-
-  patches = [
-    ./no-track_env_var.patch              # Requires rustc 1.47.0
-    ./no-match-unsizing-in-const-fn.patch # Requires rustc 1.46.0
-    ./no-loop-in-const-fn.patch           # Requires rustc 1.46.0
-    ./no-option-zip.patch                 # Requires rustc 1.46.0
-  ];
-
   buildAndTestSubdir = "crates/rust-analyzer";
 
   cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";
@@ -41,7 +29,7 @@ rustPlatform.buildRustPackage {
 
   inherit doCheck;
   preCheck = lib.optionalString doCheck ''
-    export RUST_SRC_PATH=${rustPlatform.rustcSrc}
+    export RUST_SRC_PATH=${rustPlatform.rustLibSrc}
   '';
 
   doInstallCheck = true;