From 836e6d3e021b56c84de76ff32f751ca4ea994079 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 19 Oct 2021 19:59:28 -0400 Subject: [PATCH] buildRustPackage: remove unused arguments, minor styling changes --- pkgs/build-support/rust/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2eb45bcafa13..840abb2d918a 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,17 +1,15 @@ -{ stdenv -, lib -, buildPackages +{ lib +, importCargoLock +, fetchCargoTarball +, rust +, stdenv +, callPackage , cacert +, git , cargoBuildHook , cargoCheckHook , cargoInstallHook , cargoSetupHook -, fetchCargoTarball -, importCargoLock -, rustPlatform -, callPackage -, git -, rust , rustc , libiconv , windows @@ -88,7 +86,7 @@ let (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) else target; - sysroot = (callPackage ./sysroot {}) { + sysroot = callPackage ./sysroot { } { inherit target shortTarget; RUSTFLAGS = args.RUSTFLAGS or ""; originalCargoToml = src + /Cargo.toml; # profile info is later extracted