diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-03-06 20:17:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 20:17:13 -0500 |
| commit | 8f54d931cd1475b055a8d6d8278f017cb8b72e5f (patch) | |
| tree | 0f35b2b44fc0c4a31da4ba576b18c62ae2c4d37f /pkgs/stdenv/adapters.nix | |
| parent | b5cf1d2e50795abc23b98a2a5d7cc8d9902c1a89 (diff) | |
| parent | 8d580080390d12c5efe7d5a012f016a28a7602ad (diff) | |
| download | nixlib-8f54d931cd1475b055a8d6d8278f017cb8b72e5f.tar nixlib-8f54d931cd1475b055a8d6d8278f017cb8b72e5f.tar.gz nixlib-8f54d931cd1475b055a8d6d8278f017cb8b72e5f.tar.bz2 nixlib-8f54d931cd1475b055a8d6d8278f017cb8b72e5f.tar.lz nixlib-8f54d931cd1475b055a8d6d8278f017cb8b72e5f.tar.xz nixlib-8f54d931cd1475b055a8d6d8278f017cb8b72e5f.tar.zst nixlib-8f54d931cd1475b055a8d6d8278f017cb8b72e5f.zip | |
Merge pull request #36401 from obsidiansystems/no-stdenv-cross-adapter
stdenv cross adapter: Get rid if `selfNativeBuildInput`
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 0791d9e18568..734119491a0b 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 |