From c558e5b0ead98e6fff0aa199f13c272dba7d99e4 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Tue, 8 Oct 2024 21:47:17 +0700 Subject: [PATCH] Remove deprecated toRustTarget --- flake.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index a2b98df4d..9a8a7abc2 100644 --- a/flake.nix +++ b/flake.nix @@ -103,7 +103,6 @@ mkRust = let inherit (pkgs.stdenv) hostPlatform; - inherit (pkgs.rust) toRustTarget; in { rustProfile ? "minimal" , rustExtensions ? [ @@ -113,8 +112,8 @@ "clippy" ] , channel ? "stable" - , targets ? [ (toRustTarget hostPlatform) ] - ++ pkgs.lib.optional (!hostPlatform.isMacOS) (toRustTarget pkgs.pkgsMusl.stdenv.hostPlatform) + , targets ? [ pkgs.stdenv.hostPlatform.rust.rustcTarget ] + ++ pkgs.lib.optional (!hostPlatform.isMacOS) pkgs.pkgsMusl.stdenv.hostPlatform.rust.rustcTarget }: if channel == "nightly" then pkgs.rust-bin.selectLatestNightlyWith @@ -422,7 +421,7 @@ pnameSuffix = "-static"; extraArgs = { inherit env; - CARGO_BUILD_TARGET = pkgs.rust.toRustTarget pkgs.pkgsMusl.stdenv.hostPlatform; + CARGO_BUILD_TARGET = pkgs.pkgsMusl.stdenv.hostPlatform.rust.rustcTarget; # For some reason, the rust build doesn't pick up the paths # to `libcxx`. So we specify them explicitly. #