diff --git a/flake.lock b/flake.lock index 2b0b585f..a0f9819a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1731974733, - "narHash": "sha256-enYSSZVVl15FI5p+0Y5/Ckf5DZAvXe6fBrHxyhA/njc=", + "lastModified": 1777242778, + "narHash": "sha256-VWTeqWeb8Sel/QiWyaPvCa9luAbcGawR+Rw09FJoHz0=", "owner": "ipetkov", "repo": "crane", - "rev": "3cb338ce81076ce5e461cf77f7824476addb0e1c", + "rev": "ad8b31ad0ba8448bd958d7a5d50d811dc5d271c0", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1776949667, + "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1732069891, - "narHash": "sha256-moKx8AVJrViCSdA0e0nSsG8b1dAsObI4sRAtbqbvBY8=", + "lastModified": 1777259803, + "narHash": "sha256-fIb/EoVu/1U0qVrE6qZCJ2WCfprRpywNIAVzKEACIQc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8509a51241c407d583b1963d5079585a992506e8", + "rev": "a6cb2224d975e16b5e67de688c6ad306f7203425", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0180c8d4..5d0ba1e1 100644 --- a/flake.nix +++ b/flake.nix @@ -24,13 +24,10 @@ inherit (pkgs) lib; - rustToolchain = pkgs.rust-bin.stable.latest.default.override { - targets = [ "x86_64-unknown-linux-musl" ]; - }; + rustToolchain = pkgs.rust-bin.stable.latest.default; craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; - src = lib.cleanSourceWith { src = craneLib.path ./.; filter = path: type: @@ -39,13 +36,18 @@ (craneLib.filterCargoSources path type); }; - redlib = craneLib.buildPackage { + redlib = with pkgs; craneLib.buildPackage { inherit src; strictDeps = true; doCheck = false; - CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl"; - CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static"; + nativeBuildInputs = [ + git + cmake + clang + ]; + + LIBCLANG_PATH = "${libclang.lib}/lib"; }; in {