aboutsummaryrefslogtreecommitdiff
path: root/pkgs/stdenv/adapters.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-07-24 16:46:52 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-07-24 20:01:43 -0400
commitb81ee9df9f4724b7c9ac611999758a85cf684cc4 (patch)
tree266983d300c30e3dfb3bd6684a3e244d9d76b963 /pkgs/stdenv/adapters.nix
parent839f96a4c5c4e5565239adbdf8a40667056a2652 (diff)
makeStdenvCross: Remove
It is inlined into the cross stdenv, which is its last use-case after the previous commit.
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
-rw-r--r--pkgs/stdenv/adapters.nix29
1 files changed, 0 insertions, 29 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index c05b6a05f4d..66570cba946 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -53,35 +53,6 @@ rec {
});
};
-
- # Return a modified stdenv that adds a cross compiler to the
- # builds.
- makeStdenvCross = { stdenv
- , cc
- , buildPlatform, hostPlatform, targetPlatform
- , # Prior overrides are surely not valid as packages built
- # with this run on a different platform, so disable by
- # default.
- overrides ? _: _: {}
- } @ overrideArgs:
- overrideArgs.stdenv.override (old: {
- inherit
- buildPlatform hostPlatform targetPlatform
- cc overrides;
-
- allowedRequisites = null;
- extraNativeBuildInputs = old.extraNativeBuildInputs
- # without proper `file` command, libtool sometimes fails
- # to recognize 64-bit DLLs
- ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file
- ++ stdenv.lib.optional
- (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
- pkgs.updateAutotoolsGnuConfigScriptsHook
- ;
-
- extraBuildInputs = [ ]; # Old ones run on wrong platform
- });
-
/* Modify a stdenv so that the specified attributes are added to
every derivation returned by its mkDerivation function.