From 8d580080390d12c5efe7d5a012f016a28a7602ad Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 6 Mar 2018 20:04:37 -0500 Subject: [PATCH] stdenv cross adapter: Get rid if `selfNativeBuildInput` It is finally no longer used anywhere Fixes #30587 --- pkgs/stdenv/adapters.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3090b6283e9..8e3980c358c 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -75,22 +75,11 @@ rec { in stdenv // { mkDerivation = { nativeBuildInputs ? [] - , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false , ... } @ args: - let - # *BuildInputs exists temporarily as another name for - # *HostInputs. - - # The base stdenv already knows that nativeBuildInputs and - # buildInputs should be built with the usual gcc-wrapper - # And the same for propagatedBuildInputs. - nativeDrv = stdenv.mkDerivation args; - in stdenv.mkDerivation (args // { nativeBuildInputs = nativeBuildInputs - ++ stdenv.lib.optional selfNativeBuildInput nativeDrv # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file