public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv cross adapter: Get rid if selfNativeBuildInput

Browse Source 
It is finally no longer used anywhere

Fixes #30587
This commit is contained in:
John Ericson 2018-03-06 20:04:37 -05:00
parent 76bc1d3fae
commit 8d58008039
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/stdenv/adapters.nix
View File

@ -75,22 +75,11 @@ rec {
in stdenv // { in stdenv // {
mkDerivation = mkDerivation =
{ nativeBuildInputs ? [] { nativeBuildInputs ? []
, selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false
, ... , ...
} @ args: } @ 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 // { stdenv.mkDerivation (args // {
nativeBuildInputs = nativeBuildInputs nativeBuildInputs = nativeBuildInputs
++ stdenv.lib.optional selfNativeBuildInput nativeDrv
# without proper `file` command, libtool sometimes fails # without proper `file` command, libtool sometimes fails
# to recognize 64-bit DLLs # to recognize 64-bit DLLs
++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file