diff --git a/flake.lock b/flake.lock index e78a0e19b..5df674b52 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1747291057, - "narHash": "sha256-9Wir6aLJAeJKqdoQUiwfKdBn7SyNXTJGRSscRyVOo2Y=", + "lastModified": 1763361733, + "narHash": "sha256-ka7dpwH3HIXCyD2wl5F7cPLeRbqZoY2ullALsvxdPt8=", "owner": "nix-community", "repo": "fenix", - "rev": "76ffc1b7b3ec8078fe01794628b6abff35cbda8f", + "rev": "6c8d48e3b0ae371b19ac1485744687b788e80193", "type": "github" }, "original": { @@ -147,11 +147,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1746889290, - "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=", + "lastModified": 1762860488, + "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc", + "rev": "2efc80078029894eec0699f62ec8d5c1a56af763", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4235f0c31..4029e2ff8 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,15 @@ pkgs = nixpkgs.legacyPackages.${system}; inherit (pkgs.stdenv) isDarwin; fenixPkgs = fenix.packages.${system}; - naersk' = pkgs.callPackage naersk { }; + fenixToolchain = fenixPkgs.combine [ + fenixPkgs.stable.rustc + fenixPkgs.stable.cargo + fenixPkgs.stable.rust-std + ]; + naersk' = pkgs.callPackage naersk { + cargo = fenixToolchain; + rustc = fenixToolchain; + }; manifest = (pkgs.lib.importTOML ./Cargo.toml).package; androidSdk = android.sdk.${system} (sdkPkgs: builtins.attrValues { @@ -470,6 +478,12 @@ }; libdeltachat = + let + rustPlatform = (pkgs.makeRustPlatform { + cargo = fenixToolchain; + rustc = fenixToolchain; + }); + in pkgs.stdenv.mkDerivation { pname = "libdeltachat"; version = manifest.version; @@ -479,8 +493,9 @@ nativeBuildInputs = [ pkgs.perl # Needed to build vendored OpenSSL. pkgs.cmake - pkgs.rustPlatform.cargoSetupHook - pkgs.cargo + rustPlatform.cargoSetupHook + fenixPkgs.stable.rustc + fenixPkgs.stable.cargo ]; postInstall = ''