diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-06 20:04:37 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-06 20:05:13 -0500 |
| commit | 8d580080390d12c5efe7d5a012f016a28a7602ad (patch) | |
| tree | 36602506af604e72381376dc4b1e22d4d2532b56 /pkgs/stdenv/adapters.nix | |
| parent | 76bc1d3fae46f28dd28cad8bc998dba74d03285e (diff) | |
| download | nixlib-8d580080390d12c5efe7d5a012f016a28a7602ad.tar nixlib-8d580080390d12c5efe7d5a012f016a28a7602ad.tar.gz nixlib-8d580080390d12c5efe7d5a012f016a28a7602ad.tar.bz2 nixlib-8d580080390d12c5efe7d5a012f016a28a7602ad.tar.lz nixlib-8d580080390d12c5efe7d5a012f016a28a7602ad.tar.xz nixlib-8d580080390d12c5efe7d5a012f016a28a7602ad.tar.zst nixlib-8d580080390d12c5efe7d5a012f016a28a7602ad.zip | |
stdenv cross adapter: Get rid if `selfNativeBuildInput`
It is finally no longer used anywhere Fixes #30587
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3090b6283e93..8e3980c358cc 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 |