diff --git a/dev/nix/shell.nix b/dev/nix/shell.nix index 5823bc01f..8dc22b4c1 100644 --- a/dev/nix/shell.nix +++ b/dev/nix/shell.nix @@ -24,6 +24,8 @@ RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library"; LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; LD_LIBRARY_PATH = "${rustToolchain}/lib"; + # https://github.com/NixOS/nixpkgs/issues/370494#issuecomment-2625163369 + CFLAGS = "-DJEMALLOC_STRERROR_R_RETURNS_CHAR_WITH_GNU_SOURCE"; # envs needed in order to construct some of the rust crates ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib/"; diff --git a/flake.lock b/flake.lock index 51a8e13c6..365e4787f 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1724826636, - "narHash": "sha256-hz8Szf5J9oQg6EeMhHE/eKuexoHPiDbmOZTPvijYwyM=", + "lastModified": 1740378829, + "narHash": "sha256-cwmm7F73aQFJY6YN1roNibNKwxT6FlfXkG3MEbpSp7Q=", "owner": "nix-community", "repo": "fenix", - "rev": "3454a665ff4dd29cf618e6a2e53065370876297f", + "rev": "92823f1b0c919d7e2d806956aaf98e90f3761ab7", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1724761543, - "narHash": "sha256-G4z3E2PbuAIJ4CSss6Fxs0HMSpnaxMMUFCdyVahAppg=", + "lastModified": 1740329432, + "narHash": "sha256-eKQ7aBkNvF5AhUpyJ1cW450jxomZ4gTIaYir5qsNl7Y=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8db40df2a3c1c3b18402c4844643d2fb6dce87d6", + "rev": "6d68c475c7aaf7534251182662456a4bf4216dfe", "type": "github" }, "original": {