diff options
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/cross/default.nix | 8 | ||||
-rw-r--r-- | pkgs/stdenv/custom/default.nix | 6 | ||||
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 6 | ||||
-rw-r--r-- | pkgs/stdenv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/freebsd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 | ||||
-rw-r--r-- | pkgs/stdenv/native/default.nix | 6 |
7 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 359d45b78b96..16f41671b768 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,10 +1,10 @@ { lib -, system, platform, crossSystem, config +, system, platform, crossSystem, config, overlays }: let bootStages = import ../. { - inherit lib system platform; + inherit lib system platform overlays; crossSystem = null; # Ignore custom stdenvs when cross compiling for compatability config = builtins.removeAttrs config [ "replaceStdenv" ]; @@ -18,7 +18,7 @@ in bootStages ++ [ # should be used to build compilers and other such tools targeting the cross # platform. Then, `forceNativeDrv` can be removed. (vanillaPackages: { - inherit system platform crossSystem config; + inherit system platform crossSystem config overlays; # It's OK to change the built-time dependencies allowCustomOverrides = true; stdenv = vanillaPackages.stdenv // { @@ -30,7 +30,7 @@ in bootStages ++ [ # Run packages (buildPackages: { - inherit system platform crossSystem config; + inherit system platform crossSystem config overlays; stdenv = if crossSystem.useiOSCross or false then let inherit (buildPackages.darwin.ios-cross { diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 59a6e871cfde..d7e9bf53bed1 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -1,12 +1,12 @@ { lib -, system, platform, crossSystem, config +, system, platform, crossSystem, config, overlays }: assert crossSystem == null; let bootStages = import ../. { - inherit lib system platform crossSystem; + inherit lib system platform crossSystem overlays; # Remove config.replaceStdenv to ensure termination. config = builtins.removeAttrs config [ "replaceStdenv" ]; }; @@ -15,7 +15,7 @@ in bootStages ++ [ # Additional stage, built using custom stdenv (vanillaPackages: { - inherit system platform crossSystem config; + inherit system platform crossSystem config overlays; stdenv = config.replaceStdenv { pkgs = vanillaPackages; }; }) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9c860bfb0f92..e3a87ea078fc 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,5 +1,5 @@ { lib -, system, platform, crossSystem, config +, system, platform, crossSystem, config, overlays # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let @@ -98,7 +98,7 @@ in rec { }; in { - inherit system platform crossSystem config; + inherit system platform crossSystem config overlays; stdenv = thisStdenv; }; @@ -316,7 +316,7 @@ in rec { stage3 stage4 (prevStage: { - inherit system crossSystem platform config; + inherit system crossSystem platform config overlays; stdenv = stdenvDarwin prevStage; }) ]; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 0ca03ecdde18..f60ffec4b564 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -7,7 +7,7 @@ { # Args just for stdenvs' usage lib # Args to pass on to the pkgset builder, too -, system, platform, crossSystem, config +, system, platform, crossSystem, config, overlays } @ args: let diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index e0256e26f5fb..2cb059deb34b 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,5 +1,5 @@ { lib -, system, platform, crossSystem, config +, system, platform, crossSystem, config, overlays }: assert crossSystem == null; @@ -58,7 +58,7 @@ assert crossSystem == null; }) (prevStage: { - inherit system crossSystem platform config; + inherit system crossSystem platform config overlays; stdenv = import ../generic { name = "stdenv-freebsd-boot-3"; inherit system config; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 430122c36f7b..bc8a03a485a0 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -4,7 +4,7 @@ # compiler and linker that do not search in default locations, # ensuring purity of components produced by it. { lib -, system, platform, crossSystem, config +, system, platform, crossSystem, config, overlays , bootstrapFiles ? if system == "i686-linux" then import ./bootstrap-files/i686.nix @@ -91,7 +91,7 @@ let }; in { - inherit system platform crossSystem config; + inherit system platform crossSystem config overlays; stdenv = thisStdenv; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 57182fae5236..4028638009e1 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,5 +1,5 @@ { lib -, system, platform, crossSystem, config +, system, platform, crossSystem, config, overlays }: assert crossSystem == null; @@ -134,7 +134,7 @@ in # First build a stdenv based only on tools outside the store. (prevStage: { - inherit system crossSystem platform config; + inherit system crossSystem platform config overlays; stdenv = makeStdenv { inherit (prevStage) cc fetchurl; } // { inherit (prevStage) fetchurl; }; @@ -143,7 +143,7 @@ in # Using that, build a stdenv that adds the ‘xz’ command (which most systems # don't have, so we mustn't rely on the native environment providing it). (prevStage: { - inherit system crossSystem platform config; + inherit system crossSystem platform config overlays; stdenv = makeStdenv { inherit (prevStage.stdenv) cc fetchurl; extraPath = [ prevStage.xz ]; |