From bfa8f3049989739223687324aec986d4da3b5dae Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 25 Apr 2017 21:51:24 -0400 Subject: linux cross stdenv: Use the cross stdenv and `nativeBuildInputs` This is a cross derivation---it's built on one platform to run on another---so let's structure it like all the other cross derivations. --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index b55f2bc7b7d3..77471e6dfdbe 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -146,11 +146,11 @@ rec { build = - pkgs.buildPackages.stdenv.mkDerivation { + pkgs.stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; crossConfig = pkgs.hostPlatform.config; - buildInputs = [ + nativeBuildInputs = [ pkgs.buildPackages.nukeReferences pkgs.buildPackages.cpio pkgs.buildPackages.binutils @@ -285,7 +285,7 @@ rec { allowedReferences = []; }; - dist = pkgs.buildPackages.stdenv.mkDerivation { + dist = pkgs.stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; buildCommand = '' -- cgit 1.4.1